falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

avcodec/ass: add FFmpeg signature

tags/n2.5
Clément Bœsch 11 years ago
parent
d281a87ae3
commit
52b0a0ecaa
18 changed files with 19 additions and 1 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -0
      libavcodec/ass.c
  2. +1
    -1
      tests/fate-run.sh
  3. +1
    -0
      tests/ref/fate/sub-aqtitle
  4. +1
    -0
      tests/ref/fate/sub-charenc
  5. +1
    -0
      tests/ref/fate/sub-jacosub
  6. +1
    -0
      tests/ref/fate/sub-microdvd
  7. +1
    -0
      tests/ref/fate/sub-movtext
  8. +1
    -0
      tests/ref/fate/sub-mpl2
  9. +1
    -0
      tests/ref/fate/sub-mpsub
  10. +1
    -0
      tests/ref/fate/sub-mpsub-frames
  11. +1
    -0
      tests/ref/fate/sub-pjs
  12. +1
    -0
      tests/ref/fate/sub-realtext
  13. +1
    -0
      tests/ref/fate/sub-sami
  14. +1
    -0
      tests/ref/fate/sub-srt
  15. +1
    -0
      tests/ref/fate/sub-subviewer
  16. +1
    -0
      tests/ref/fate/sub-subviewer1
  17. +1
    -0
      tests/ref/fate/sub-vplayer
  18. +1
    -0
      tests/ref/fate/sub-webvtt

+ 2
- 0
libavcodec/ass.c View File

@@ -34,6 +34,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
{ {
avctx->subtitle_header = av_asprintf( avctx->subtitle_header = av_asprintf(
"[Script Info]\r\n" "[Script Info]\r\n"
"; Script generated by FFmpeg/Lavc%s\r\n"
"ScriptType: v4.00+\r\n" "ScriptType: v4.00+\r\n"
"PlayResX: 384\r\n" "PlayResX: 384\r\n"
"PlayResY: 288\r\n" "PlayResY: 288\r\n"
@@ -65,6 +66,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"\r\n" "\r\n"
"[Events]\r\n" "[Events]\r\n"
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n", "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n",
!(avctx->flags & CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",
font, font_size, color, color, back_color, back_color, font, font_size, color, color, back_color, back_color,
-bold, -italic, -underline, alignment); -bold, -italic, -underline, alignment);




+ 1
- 1
tests/fate-run.sh View File

@@ -117,7 +117,7 @@ pcm(){
fmtstdout(){ fmtstdout(){
fmt=$1 fmt=$1
shift 1 shift 1
ffmpeg "$@" -f $fmt -
ffmpeg -flags +bitexact "$@" -f $fmt -
} }


enc_dec_pcm(){ enc_dec_pcm(){


+ 1
- 0
tests/ref/fate/sub-aqtitle View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-charenc View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-jacosub View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-microdvd View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-movtext View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-mpl2 View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-mpsub View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-mpsub-frames View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-pjs View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-realtext View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-sami View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-srt View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-subviewer View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-subviewer1 View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-vplayer View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


+ 1
- 0
tests/ref/fate/sub-webvtt View File

@@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288


Write Preview
Loading…
Cancel
Save