Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/ass.c2
-rwxr-xr-xtests/fate-run.sh2
-rw-r--r--tests/ref/fate/sub-aqtitle1
-rw-r--r--tests/ref/fate/sub-charenc1
-rw-r--r--tests/ref/fate/sub-jacosub1
-rw-r--r--tests/ref/fate/sub-microdvd1
-rw-r--r--tests/ref/fate/sub-movtext1
-rw-r--r--tests/ref/fate/sub-mpl21
-rw-r--r--tests/ref/fate/sub-mpsub1
-rw-r--r--tests/ref/fate/sub-mpsub-frames1
-rw-r--r--tests/ref/fate/sub-pjs1
-rw-r--r--tests/ref/fate/sub-realtext1
-rw-r--r--tests/ref/fate/sub-sami1
-rw-r--r--tests/ref/fate/sub-srt1
-rw-r--r--tests/ref/fate/sub-subviewer1
-rw-r--r--tests/ref/fate/sub-subviewer11
-rw-r--r--tests/ref/fate/sub-vplayer1
-rw-r--r--tests/ref/fate/sub-webvtt1
18 files changed, 19 insertions, 1 deletions
diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index ac1bfae061..fd00981a68 100644
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -34,6 +34,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
{
avctx->subtitle_header = av_asprintf(
"[Script Info]\r\n"
+ "; Script generated by FFmpeg/Lavc%s\r\n"
"ScriptType: v4.00+\r\n"
"PlayResX: 384\r\n"
"PlayResY: 288\r\n"
@@ -65,6 +66,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"\r\n"
"[Events]\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,
-bold, -italic, -underline, alignment);
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2f18fa3099..f00a0be97f 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -117,7 +117,7 @@ pcm(){
fmtstdout(){
fmt=$1
shift 1
- ffmpeg "$@" -f $fmt -
+ ffmpeg -flags +bitexact "$@" -f $fmt -
}
enc_dec_pcm(){
diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
index 7c422c9a03..87253c9a2d 100644
--- a/tests/ref/fate/sub-aqtitle
+++ b/tests/ref/fate/sub-aqtitle
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
index 199653acb3..ed5cdbe5c7 100644
--- a/tests/ref/fate/sub-charenc
+++ b/tests/ref/fate/sub-charenc
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub
index 4e719f6875..a30fe4a196 100644
--- a/tests/ref/fate/sub-jacosub
+++ b/tests/ref/fate/sub-jacosub
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
index 73f17bb08e..f0eb331823 100644
--- a/tests/ref/fate/sub-microdvd
+++ b/tests/ref/fate/sub-microdvd
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext
index 8c573ef019..6a90e967d3 100644
--- a/tests/ref/fate/sub-movtext
+++ b/tests/ref/fate/sub-movtext
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2
index 7529e5b04a..72fc0fccd7 100644
--- a/tests/ref/fate/sub-mpl2
+++ b/tests/ref/fate/sub-mpl2
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
index fffc3c4102..890ceb08a2 100644
--- a/tests/ref/fate/sub-mpsub
+++ b/tests/ref/fate/sub-mpsub
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
index 3d8ac5a823..64528ec70e 100644
--- a/tests/ref/fate/sub-mpsub-frames
+++ b/tests/ref/fate/sub-mpsub-frames
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs
index 36f3fe5664..799c62b2a3 100644
--- a/tests/ref/fate/sub-pjs
+++ b/tests/ref/fate/sub-pjs
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext
index 6c67acdf4e..cd9aa5a294 100644
--- a/tests/ref/fate/sub-realtext
+++ b/tests/ref/fate/sub-realtext
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami
index 63c50193d7..caa85a268f 100644
--- a/tests/ref/fate/sub-sami
+++ b/tests/ref/fate/sub-sami
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index 8b5e32b1d2..4439857a59 100644
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer
index ca203b4d6f..19944f6416 100644
--- a/tests/ref/fate/sub-subviewer
+++ b/tests/ref/fate/sub-subviewer
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1
index 86867a8008..a75406b857 100644
--- a/tests/ref/fate/sub-subviewer1
+++ b/tests/ref/fate/sub-subviewer1
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer
index 8017b62068..6e804f6c22 100644
--- a/tests/ref/fate/sub-vplayer
+++ b/tests/ref/fate/sub-vplayer
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt
index 0c8f12b98d..8c63a90279 100644
--- a/tests/ref/fate/sub-webvtt
+++ b/tests/ref/fate/sub-webvtt
@@ -1,4 +1,5 @@
[Script Info]
+; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288