avcodec/ass: explicitly set ScaledBorderAndShadow

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index 7c26e3fd6d732af9956ff83e03341c24950d863c..627741936aee46438d277bec681a55d6da69cf07 100644 (file)
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -40,6 +40,7 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx,
              "ScriptType: v4.00+\r\n"
              "PlayResX: %d\r\n"
              "PlayResY: %d\r\n"
+             "ScaledBorderAndShadow: yes\r\n"
              "\r\n"
              "[V4+ Styles]\r\n"
 

diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
index 87253c9a2d2f5e62eef60cb829eb2b13e15f7549..af0c06d7c2809e2bfe8859f2f53cafd3c1808889 100644 (file)
--- a/tests/ref/fate/sub-aqtitle
+++ b/tests/ref/fate/sub-aqtitle
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-cc b/tests/ref/fate/sub-cc
index 4cc02d1d17439f56b8c8fe37881b31fdf6659ec9..2b30a35be0af2a446a07fe595c22fcf8612103ad 100644 (file)
--- a/tests/ref/fate/sub-cc
+++ b/tests/ref/fate/sub-cc
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-cc-realtime b/tests/ref/fate/sub-cc-realtime
index be800a4d296cd2b21a9240a92eb4e51d8c5c582f..5a95ff5cb70fc2e89a42820819e1056edb80b38d 100644 (file)
--- a/tests/ref/fate/sub-cc-realtime
+++ b/tests/ref/fate/sub-cc-realtime
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-cc-scte20 b/tests/ref/fate/sub-cc-scte20
index 71fc92bfc5da5d71dc14fc2e25242bda011fc17d..be28084887a9b7fb80ae4ff3369cf7192a978919 100644 (file)
--- a/tests/ref/fate/sub-cc-scte20
+++ b/tests/ref/fate/sub-cc-scte20
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
index a056cd10926d71208848e3f918d91ca2f6d2fb6f..4efacb073d14b43002b58ab0b4aa55e9d34de029 100644 (file)
--- a/tests/ref/fate/sub-charenc
+++ b/tests/ref/fate/sub-charenc
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub
index 5f282cdcf64e4a93b6293854350a7d1d65b72491..b574dda54dfdee55a07f13c808ee3baa6e100798 100644 (file)
--- a/tests/ref/fate/sub-jacosub
+++ b/tests/ref/fate/sub-jacosub
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
index d2170bc2a413306e52042952469fba5a6c006cf6..4ddb254c698245958b12e3ab0e988ef6359592a8 100644 (file)
--- a/tests/ref/fate/sub-microdvd
+++ b/tests/ref/fate/sub-microdvd
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext
index 60470609187ca024b93e6e391de56ae224c1588a..6e2d2e35dbd94d6dded683b59436645805723372 100644 (file)
--- a/tests/ref/fate/sub-movtext
+++ b/tests/ref/fate/sub-movtext
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2
index 72fc0fccd785dcec3c89e5434bc800589c1a9b6b..f78cf6849530c0015fe58a6cc7cb1584d6c4c4ce 100644 (file)
--- a/tests/ref/fate/sub-mpl2
+++ b/tests/ref/fate/sub-mpl2
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
index 890ceb08a25aa344def4ca21fad723bb6a5f0849..1a8e757585a91121cb27f360b352fecc34340d8b 100644 (file)
--- a/tests/ref/fate/sub-mpsub
+++ b/tests/ref/fate/sub-mpsub
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
index 17695787be23e1032c726e1794bf99ac383f148f..abd52ad277212d34a93b31b2114345e91f3ea1dc 100644 (file)
--- a/tests/ref/fate/sub-mpsub-frames
+++ b/tests/ref/fate/sub-mpsub-frames
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs
index 799c62b2a3e5a3b65213057aeec1597c3e637dc8..378190a3eb0aa64fd983bc10dd1caa512ba6c92e 100644 (file)
--- a/tests/ref/fate/sub-pjs
+++ b/tests/ref/fate/sub-pjs
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext
index cd9aa5a294a0c8e6c35fa2713096f52798f81fbf..04b1664f8968cc550ce6f695f3bd68544ce3c0cb 100644 (file)
--- a/tests/ref/fate/sub-realtext
+++ b/tests/ref/fate/sub-realtext
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami
index 3a013908d5c21029730cf02d84ded6a4146e9e85..dbd1cc310d670d6a2874af6d669b8e0d43c3b7cd 100644 (file)
--- a/tests/ref/fate/sub-sami
+++ b/tests/ref/fate/sub-sami
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-sami2 b/tests/ref/fate/sub-sami2
index 64656f06cbdd3e15f463bb0d0bfb14e0948ef763..dbec842d2b0181ebc0a7e8eefbd2991273255efb 100644 (file)
--- a/tests/ref/fate/sub-sami2
+++ b/tests/ref/fate/sub-sami2
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-scc b/tests/ref/fate/sub-scc
index 5c3e1880afc2162420bc6f16ed9a0472285e0e6a..62cbf6fa4a499ba2c782cabf7f96cf928a66d0f8 100644 (file)
--- a/tests/ref/fate/sub-scc
+++ b/tests/ref/fate/sub-scc
@@ -3,6 +3,7 @@
 ScriptType: v4.00+
 PlayResX: 384
 PlayResY: 288
+ScaledBorderAndShadow: yes
 
 [V4+ Styles]
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index fd602909299ca586a40e4665bdcc1c6c014f475a..b4eed235ce01f1f85bb26fd49fcdc123467c4740 100644 (file)
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-srt-badsyntax b/tests/ref/fate/sub-srt-badsyntax
index 1561d3f2f25ca209d23c986641bd0e7cb70c3828..61f472a84b9aac22954215b60df7acdecd05fddc 100644 (file)
--- a/tests/ref/fate/sub-srt-badsyntax
+++ b/tests/ref/fate/sub-srt-badsyntax
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-stl b/tests/ref/fate/sub-stl
index cde33cd7cd9e864b4dc47c59a71810ba72446cde..0f326c21730c959e9428cd96a5eca21014b5c888 100644 (file)
--- a/tests/ref/fate/sub-stl
+++ b/tests/ref/fate/sub-stl
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer
index 19944f6416b64e1a1200c819c76dbad73229a3fb..c68a6442be223b8c98cef6e3a67b5a176cd434c9 100644 (file)
--- a/tests/ref/fate/sub-subviewer
+++ b/tests/ref/fate/sub-subviewer
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1
index a75406b85799414d61f1761848a6b210e2dee36c..e88729ad5ec990202f9d23f96288a36eb5a845bb 100644 (file)
--- a/tests/ref/fate/sub-subviewer1
+++ b/tests/ref/fate/sub-subviewer1
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer
index 6e804f6c22ef4098381d69bacc40095767b3e40d..d83db9e09fce65590dd76ed3fac7fa6cdf146f60 100644 (file)
--- a/tests/ref/fate/sub-vplayer
+++ b/tests/ref/fate/sub-vplayer
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt
index 8c63a90279bf0116fee433fac2bb7e59befa765e..dea535b19b20e00c4249950af9b511a2e1a617f9 100644 (file)
--- a/tests/ref/fate/sub-webvtt
+++ b/tests/ref/fate/sub-webvtt
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r

diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2
index 9f7827d66fe40ad3b378402b3614316d45eb9240..357b8178ea1cf224ad47dcf78b24f1948ece6665 100644 (file)
--- a/tests/ref/fate/sub-webvtt2
+++ b/tests/ref/fate/sub-webvtt2
@@ -3,6 +3,7 @@
 ScriptType: v4.00+\r
 PlayResX: 384\r
 PlayResY: 288\r
+ScaledBorderAndShadow: yes\r
 \r
 [V4+ Styles]\r
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r