har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/ass: add FFmpeg signature

Browse Source
This commit is contained in:
Clément Bœsch 2014-10-11 18:37:43 +02:00
parent d281a87ae3
commit 52b0a0ecaa
18 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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);

2
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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