diff options
author | Clément Bœsch <u@pkh.me> | 2014-06-18 18:37:59 +0200 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2014-06-18 18:43:36 +0200 |
commit | 88514378bac99872265dad28072fb30160b26bfa (patch) | |
tree | 3c031eba89102e19c9d956ddb785d5dd0ec77cce | |
parent | 5039aadf68deb9ad6dd0737ea11259fe53d3727b (diff) | |
download | ffmpeg-streaming-88514378bac99872265dad28072fb30160b26bfa.zip ffmpeg-streaming-88514378bac99872265dad28072fb30160b26bfa.tar.gz |
avcodec/ass: move playres parameters below scripttype
Suggested-by: wm4
-rw-r--r-- | libavcodec/ass.c | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-aqtitle | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-charenc | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-jacosub | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-microdvd | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-movtext | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpl2 | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpsub | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpsub-frames | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-pjs | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-realtext | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-sami | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-srt | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-subviewer | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-subviewer1 | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-vplayer | 2 | ||||
-rw-r--r-- | tests/ref/fate/sub-webvtt | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 4edff84..a5b5ae5 100644 --- 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 0d04c9d..d87194b 100644 --- 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 a5a54e9..5081731 100644 --- 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 9802484..b9b0cf7 100644 --- 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 1dff1a5..f72308e 100644 --- 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 5409dec..3274395 100644 --- 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 37a9391..39b38bc 100644 --- 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 b0f5db5..d49ba2a 100644 --- 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 4a336c4..f78edd0 100644 --- 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 9457271..3535039 100644 --- 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 079a664..4dc5753 100644 --- 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 0d72ca0..0f5dc6d 100644 --- 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 66ba339..c5044e3 100644 --- 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 c7e4628..a083868 100644 --- 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 c617537..7d2ca53 100644 --- 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 8077d5b..70ba787 100644 --- 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 dc1bef6..528e55c 100644 --- a/tests/ref/fate/sub-webvtt +++ b/tests/ref/fate/sub-webvtt @@ -1 +1 @@ -6b915f0a00ab04649f6ce769da0af916 +ee266bd7141df4ea11a9447ab038bb6e |