avcodec/ass: move playres parameters below scripttype

Suggested-by: wm4

diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index 4edff84933fbe9463660491462575363e4c18851..a5b5ae5fb2e4d130135fbb2a39583d5467211ff8 100644 (file)
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -34,9 +34,9 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
 {
     avctx->subtitle_header = av_asprintf(
              "[Script Info]\r\n"
+             "ScriptType: v4.00+\r\n"
              "PlayResX: 384\r\n"
              "PlayResY: 288\r\n"
-             "ScriptType: v4.00+\r\n"
              "\r\n"
              "[V4+ Styles]\r\n"
              "Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding\r\n"

diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
index 0d04c9d30710c3accb0f126b3d908de410d5a4f9..d87194bbd9ef21dc7008f0112380a776b5afda58 100644 (file)
--- a/tests/ref/fate/sub-aqtitle
+++ b/tests/ref/fate/sub-aqtitle
@@ -1 +1 @@
-2603c926b8b235032762ef2ae47a7779
+47834efc39225264e705dfb885f57df2

diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
index a5a54e956f0174a8324f4f9a0e2badc44edd52f4..5081731a838db27afb4ac8e1b6c15077c7b5082d 100644 (file)
--- a/tests/ref/fate/sub-charenc
+++ b/tests/ref/fate/sub-charenc
@@ -1 +1 @@
-6ae00c6970e873d82ef5d06d40e144fe
+c088c2924fd7af0a53eeeeb54a3f4456

diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub
index 9802484ee0b61f9d172955500ec82fd0fea1b513..b9b0cf76d93b5460d153339352909e8d8d891422 100644 (file)
--- a/tests/ref/fate/sub-jacosub
+++ b/tests/ref/fate/sub-jacosub
@@ -1 +1 @@
-5547b430172107fc242385e9c639fa93
+3bf9f062bd9825c7d8c3b62451b6d360

diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
index 1dff1a50c5985997984dd3db3b1e26766500d95b..f72308eaf719117cd79b2cdefd196d093925e8e9 100644 (file)
--- a/tests/ref/fate/sub-microdvd
+++ b/tests/ref/fate/sub-microdvd
@@ -1 +1 @@
-c150177fc8bb928b51de3533fd105225
+1741d6776462277430d5e320157f5bf9

diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext
index 5409dec26f2fa41b5c47d04cda6651a1a9c68f0c..327439549ea71e984c555f0fd9aa10b03e134abd 100644 (file)
--- a/tests/ref/fate/sub-movtext
+++ b/tests/ref/fate/sub-movtext
@@ -1 +1 @@
-ac8c13bac8e0e43c84eaa525680964f0
+24c02caa25c6a82d803171697a10d8f5

diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2
index 37a939132bd021f9d9ebbe31e75644234da16b5c..39b38bc23a8374672784a885d79384d2bd63ae75 100644 (file)
--- a/tests/ref/fate/sub-mpl2
+++ b/tests/ref/fate/sub-mpl2
@@ -1 +1 @@
-4a7699ff366788a4af6243ab28d2f9ff
+28fb7dad61c3394f5edc8b186fdf7dd6

diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
index b0f5db50b8f21b8265d9786972249e6dacd7dd3e..d49ba2acde4ea8f50f5a50ba20d59a818a9ca2dc 100644 (file)
--- a/tests/ref/fate/sub-mpsub
+++ b/tests/ref/fate/sub-mpsub
@@ -1 +1 @@
-7d047bdf176d4477c8713e89be5dec8e
+2f10577c4e2631e9a50495fa2cc9a985

diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
index 4a336c4e076e81f42dddf1dc434b05850665965e..f78edd0ee84b69235d63f39952cef4d495d4f0a1 100644 (file)
--- a/tests/ref/fate/sub-mpsub-frames
+++ b/tests/ref/fate/sub-mpsub-frames
@@ -1 +1 @@
-ae1dce6321a0eb1bc406ca8660350023
+792dab5d9a471e0381e18b705fc408cc

diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs
index 9457271565ebdb77169cef834f9b0d4771902b3d..353503917627821600d44548a07723dd20743675 100644 (file)
--- a/tests/ref/fate/sub-pjs
+++ b/tests/ref/fate/sub-pjs
@@ -1 +1 @@
-1e188b18693844b3a30e91a650f68e1b
+a335eefaf09b3b148e65c757bf41af4d

diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext
index 079a664cc98895911f6224d321b80e870b92a701..4dc5753e8fe1426e57422fc76854123b568b6bd8 100644 (file)
--- a/tests/ref/fate/sub-realtext
+++ b/tests/ref/fate/sub-realtext
@@ -1 +1 @@
-77103e00504d1e1b3302a990a646ae38
+a36977a149ce60eac443e4c9bb329ca2

diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami
index 0d72ca0e77b59095aac1b70b3038f4388b0bc93a..0f5dc6d344be776fcd3458683bb5288d542ea061 100644 (file)
--- a/tests/ref/fate/sub-sami
+++ b/tests/ref/fate/sub-sami
@@ -1 +1 @@
-4577f9c289440558026dc426584a06d8
+04098faede85ddacb40aa12c798cc0cc

diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index 66ba339ef01f154ca25d2baadec42d05073e1821..c5044e38051b22c96fcd847afdb507aaff88c4c3 100644 (file)
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -1 +1 @@
-5315582436b3381996dca4a767a080a0
+be870f5037933b6890d56e614ec4aa75

diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer
index c7e46287bbe1d5732acaa298ad7f8c9457113897..a0838685e8a36771ea595dde0285da3ff98d3445 100644 (file)
--- a/tests/ref/fate/sub-subviewer
+++ b/tests/ref/fate/sub-subviewer
@@ -1 +1 @@
-0954f324e9c8137d7f50fc705199e9a4
+848f774195e873ce71febf35b6c9c541

diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1
index c617537ca8b238932cf903c8592dab2458920611..7d2ca53a9020769f139897456fcb900e93945a14 100644 (file)
--- a/tests/ref/fate/sub-subviewer1
+++ b/tests/ref/fate/sub-subviewer1
@@ -1 +1 @@
-89aa422b7a6cd4dc9beef1b5a67d4aab
+040d7880a6621b1661f9d12c5375037f

diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer
index 8077d5b1e9cb8b29f03c7fa65465c58f960446ba..70ba787a5d5628b6a6134c4190f7632d6c80ae45 100644 (file)
--- a/tests/ref/fate/sub-vplayer
+++ b/tests/ref/fate/sub-vplayer
@@ -1 +1 @@
-d8405387687269f7d763fc324c7c01bb
+0bb5d4f72b6dc1b37d2ee7b5579ed87e

diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt
index dc1bef6fb342de79bee6b3f74a1f26fcc06803d9..528e55c5e22969b720ae6124a0e172f122518acc 100644 (file)
--- a/tests/ref/fate/sub-webvtt
+++ b/tests/ref/fate/sub-webvtt
@@ -1 +1 @@
-6b915f0a00ab04649f6ce769da0af916
+ee266bd7141df4ea11a9447ab038bb6e