diff options
author | Oneric <oneric@oneric.de> | 2020-04-17 01:38:53 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-23 01:26:38 +0300 |
commit | e6dcb6a0db7d05f789f8a672d61704d170836555 (patch) | |
tree | 090a6a37029784631bacff3116f25451b74d4bf4 | |
parent | 82f9eb6f6c7165a404426bee8a61aac76508a177 (diff) |
avcodec/ass: explicitly set ScaledBorderAndShadow
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/ass.c | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-aqtitle | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-cc | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-cc-realtime | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-cc-scte20 | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-charenc | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-jacosub | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-microdvd | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-movtext | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpl2 | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpsub | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-mpsub-frames | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-pjs | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-realtext | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-sami | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-sami2 | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-scc | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-srt | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-srt-badsyntax | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-stl | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-subviewer | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-subviewer1 | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-vplayer | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-webvtt | 1 | ||||
-rw-r--r-- | tests/ref/fate/sub-webvtt2 | 1 |
25 files changed, 25 insertions, 0 deletions
diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 7c26e3fd6d..627741936a 100644 --- 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 87253c9a2d..af0c06d7c2 100644 --- a/tests/ref/fate/sub-aqtitle +++ b/tests/ref/fate/sub-aqtitle @@ -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-cc b/tests/ref/fate/sub-cc index 4cc02d1d17..2b30a35be0 100644 --- a/tests/ref/fate/sub-cc +++ b/tests/ref/fate/sub-cc @@ -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-cc-realtime b/tests/ref/fate/sub-cc-realtime index be800a4d29..5a95ff5cb7 100644 --- a/tests/ref/fate/sub-cc-realtime +++ b/tests/ref/fate/sub-cc-realtime @@ -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-cc-scte20 b/tests/ref/fate/sub-cc-scte20 index 71fc92bfc5..be28084887 100644 --- a/tests/ref/fate/sub-cc-scte20 +++ b/tests/ref/fate/sub-cc-scte20 @@ -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-charenc b/tests/ref/fate/sub-charenc index a056cd1092..4efacb073d 100644 --- a/tests/ref/fate/sub-charenc +++ b/tests/ref/fate/sub-charenc @@ -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-jacosub b/tests/ref/fate/sub-jacosub index 5f282cdcf6..b574dda54d 100644 --- a/tests/ref/fate/sub-jacosub +++ b/tests/ref/fate/sub-jacosub @@ -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-microdvd b/tests/ref/fate/sub-microdvd index d2170bc2a4..4ddb254c69 100644 --- a/tests/ref/fate/sub-microdvd +++ b/tests/ref/fate/sub-microdvd @@ -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-movtext b/tests/ref/fate/sub-movtext index 6047060918..6e2d2e35db 100644 --- a/tests/ref/fate/sub-movtext +++ b/tests/ref/fate/sub-movtext @@ -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-mpl2 b/tests/ref/fate/sub-mpl2 index 72fc0fccd7..f78cf68495 100644 --- a/tests/ref/fate/sub-mpl2 +++ b/tests/ref/fate/sub-mpl2 @@ -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-mpsub b/tests/ref/fate/sub-mpsub index 890ceb08a2..1a8e757585 100644 --- a/tests/ref/fate/sub-mpsub +++ b/tests/ref/fate/sub-mpsub @@ -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-mpsub-frames b/tests/ref/fate/sub-mpsub-frames index 17695787be..abd52ad277 100644 --- a/tests/ref/fate/sub-mpsub-frames +++ b/tests/ref/fate/sub-mpsub-frames @@ -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-pjs b/tests/ref/fate/sub-pjs index 799c62b2a3..378190a3eb 100644 --- a/tests/ref/fate/sub-pjs +++ b/tests/ref/fate/sub-pjs @@ -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-realtext b/tests/ref/fate/sub-realtext index cd9aa5a294..04b1664f89 100644 --- a/tests/ref/fate/sub-realtext +++ b/tests/ref/fate/sub-realtext @@ -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-sami b/tests/ref/fate/sub-sami index 3a013908d5..dbd1cc310d 100644 --- a/tests/ref/fate/sub-sami +++ b/tests/ref/fate/sub-sami @@ -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-sami2 b/tests/ref/fate/sub-sami2 index 64656f06cb..dbec842d2b 100644 --- a/tests/ref/fate/sub-sami2 +++ b/tests/ref/fate/sub-sami2 @@ -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-scc b/tests/ref/fate/sub-scc index 5c3e1880af..62cbf6fa4a 100644 --- 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 fd60290929..b4eed235ce 100644 --- a/tests/ref/fate/sub-srt +++ b/tests/ref/fate/sub-srt @@ -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-badsyntax b/tests/ref/fate/sub-srt-badsyntax index 1561d3f2f2..61f472a84b 100644 --- a/tests/ref/fate/sub-srt-badsyntax +++ b/tests/ref/fate/sub-srt-badsyntax @@ -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-stl b/tests/ref/fate/sub-stl index cde33cd7cd..0f326c2173 100644 --- a/tests/ref/fate/sub-stl +++ b/tests/ref/fate/sub-stl @@ -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-subviewer b/tests/ref/fate/sub-subviewer index 19944f6416..c68a6442be 100644 --- a/tests/ref/fate/sub-subviewer +++ b/tests/ref/fate/sub-subviewer @@ -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-subviewer1 b/tests/ref/fate/sub-subviewer1 index a75406b857..e88729ad5e 100644 --- a/tests/ref/fate/sub-subviewer1 +++ b/tests/ref/fate/sub-subviewer1 @@ -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-vplayer b/tests/ref/fate/sub-vplayer index 6e804f6c22..d83db9e09f 100644 --- a/tests/ref/fate/sub-vplayer +++ b/tests/ref/fate/sub-vplayer @@ -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-webvtt b/tests/ref/fate/sub-webvtt index 8c63a90279..dea535b19b 100644 --- a/tests/ref/fate/sub-webvtt +++ b/tests/ref/fate/sub-webvtt @@ -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-webvtt2 b/tests/ref/fate/sub-webvtt2 index 9f7827d66f..357b8178ea 100644 --- a/tests/ref/fate/sub-webvtt2 +++ b/tests/ref/fate/sub-webvtt2 @@ -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
|