From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3608844C06 for ; Sun, 13 Nov 2022 20:15:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EF7668BAA0; Sun, 13 Nov 2022 22:15:12 +0200 (EET) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.219]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 615B768B461 for ; Sun, 13 Nov 2022 22:15:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1668370504; s=strato-dkim-0002; d=oneric.de; h=In-Reply-To:References:Message-ID:Subject:To:From:Date:Cc:Date:From: Subject:Sender; bh=bFvFcWFFI2CSMGH5+R6eZdWjgxRCC3yOO2XqF7P4NG0=; b=V+jS7Mvg8u+keEo5tdZMXD9Gvh75kvQY8oEBXp1YzWW0+kpP3WJCEYeWYrNYTDh+2Z gm4sBRbbRe1aWw+hJ4Jhtqfkdu2zPqVkx56wha8wSKuusFvrIxpck6wI2KDKnnafpVGx gzlkK4DIzLnuYl+icw20HZzR+cJ0LN5M1VPj5vitU5PhvBPxErF4nbtgCndLwwEVSDr2 uLOOIblsO/9SLAfJFQqQyIKHj2Vqi0HwsU5bj9elHg20dwErZtmY4GwrYrkIgnhAiF7S uxuE1GGjuX4B2Ekbl8+2YEWJPe6p9+yIzoavyK4cwucIVqN0IwFEWpWizT7IZMoy8nYc OQug== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyYHd48hugDaTPD0scTjgixgxauA" X-RZG-CLASS-ID: mo00 Received: from oneric.de by smtp.strato.de (RZmta 48.2.1 AUTH) with ESMTPSA id V28b60yADKF42DA (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Sun, 13 Nov 2022 21:15:04 +0100 (CET) Date: Sun, 13 Nov 2022 21:15:04 +0100 From: Oneric To: FFmpeg development discussions and patches Message-ID: References: <20221113195718.17752-1-oneric@oneric.de> <20221113195718.17752-4-oneric@oneric.de> MIME-Version: 1.0 In-Reply-To: <20221113195718.17752-4-oneric@oneric.de> Subject: Re: [FFmpeg-devel] [PATCH v2 3/3] avcodec/ass: specify a permissive encoding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============3651393392550520324==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============3651393392550520324== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vo8OQaIe57hwPGyw" Content-Disposition: inline --vo8OQaIe57hwPGyw Content-Type: multipart/mixed; boundary="cu6bbacIFJHGWJA0" Content-Disposition: inline --cu6bbacIFJHGWJA0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline For some reason this message for the third patch was sent out as plain 7-bit us-ASCII, stripping the CRLF line endings. Using the very same git send-email command line except for an added --to= for sending it directly to myself, yields the expected "printed-quotable" encoded message preserving the CRLF line endings. Perhaps the list mangled it when adding its footer? Either way, the second patch got through correctly with base64 encoding and there areno problems with the first patch. To apply the third patch you may use v1 or the attached patch file. If you want to instead resend a v3 for all patches, let me know. For the future I configured git send-email to always use base64 no matter the content hopefully stopping the list from mangling my patches. Oneric --cu6bbacIFJHGWJA0 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-avcodec-ass-specify-a-permissive-encoding.patch" Content-Transfer-Encoding: quoted-printable =46rom 73cacae6cb88aad4eb90c3b2b101ac1c5a6e2f69 Mon Sep 17 00:00:00 2001 =46rom: Oneric Date: Sat, 12 Nov 2022 18:59:04 +0100 Subject: [PATCH] avcodec/ass: specify a permissive encoding The Encoding field (and the \fe tag) allows to limit font selection to only those fonts declaring support for the specified codepage in their OS/2's table "Code Page Character Range" field. Particularly, Encoding=3D0 means only font's declaring support for "ANSI", or rather "Latin (Western European)", are allowed to be selected. Specifying Encoding=3D1 allows all fonts to be considered. We do not want to limit font selection, so specify Encoding=3D1. NB: at the time of writing libass only partially supports this field, thus hiding the issue in any libass-based renderer. A VSFilter-based DirectShow filter or XySubFilter will reveal the issue when a font not declaring support for latin characters is specified in a style. --- libavcodec/ass.c | 2 +- tests/ref/fate/sub-aqtitle | 2 +- tests/ref/fate/sub-cc | 2 +- tests/ref/fate/sub-cc-realtime | 2 +- tests/ref/fate/sub-cc-scte20 | 2 +- tests/ref/fate/sub-charenc | 2 +- tests/ref/fate/sub-jacosub | 2 +- tests/ref/fate/sub-microdvd | 2 +- tests/ref/fate/sub-movtext | 2 +- tests/ref/fate/sub-mpl2 | 2 +- tests/ref/fate/sub-mpsub | 2 +- tests/ref/fate/sub-mpsub-frames | 2 +- tests/ref/fate/sub-pjs | 2 +- tests/ref/fate/sub-realtext | 2 +- tests/ref/fate/sub-sami | 2 +- tests/ref/fate/sub-sami2 | 2 +- tests/ref/fate/sub-scc | 2 +- tests/ref/fate/sub-srt | 2 +- tests/ref/fate/sub-srt-badsyntax | 2 +- tests/ref/fate/sub-stl | 2 +- tests/ref/fate/sub-subviewer | 2 +- tests/ref/fate/sub-subviewer1 | 2 +- tests/ref/fate/sub-vplayer | 2 +- tests/ref/fate/sub-webvtt | 2 +- tests/ref/fate/sub-webvtt2 | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index d2ea4c62c3..5058dc8337 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -65,7 +65,7 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx, "0,0," /* Spacing, Angle */ "%d,1,0," /* BorderStyle, Outline, Shadow */ "%d,10,10,10," /* Alignment, Margin[LRV] */ - "0\r\n" /* Encoding */ + "1\r\n" /* Encoding */ =20 "\r\n" "[Events]\r\n" diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle index ae5edcd9ab..2980d39427 100644 --- a/tests/ref/fate/sub-aqtitle +++ b/tests/ref/fate/sub-aqtitle @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-cc b/tests/ref/fate/sub-cc index 516d26af9a..5e4f5ff7fc 100644 --- a/tests/ref/fate/sub-cc +++ b/tests/ref/fate/sub-cc @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,0=0D +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-cc-realtime b/tests/ref/fate/sub-cc-realtime index 98dfef5501..22f09d5cdd 100644 --- a/tests/ref/fate/sub-cc-realtime +++ b/tests/ref/fate/sub-cc-realtime @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,0=0D +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-cc-scte20 b/tests/ref/fate/sub-cc-scte20 index a97d29f70b..cded979cb8 100644 --- a/tests/ref/fate/sub-cc-scte20 +++ b/tests/ref/fate/sub-cc-scte20 @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,0=0D +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc index 339137ae0b..67e209856f 100644 --- a/tests/ref/fate/sub-charenc +++ b/tests/ref/fate/sub-charenc @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub index 32086d9365..9f555fb747 100644 --- a/tests/ref/fate/sub-jacosub +++ b/tests/ref/fate/sub-jacosub @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd index 11440c2824..fa418f53db 100644 --- a/tests/ref/fate/sub-microdvd +++ b/tests/ref/fate/sub-microdvd @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,= 0,0,1,1,0,2,10,10,10,0=0D +Style: Default,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,= 0,0,1,1,0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext index 973e9f1645..f96af3f8cf 100644 --- a/tests/ref/fate/sub-movtext +++ b/tests/ref/fate/sub-movtext @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Serif,18,&Hffffff,&Hffffff,&Hff000000,&Hff000000,0,0,0,0,10= 0,100,0,0,1,1,0,2,10,10,10,0=0D +Style: Default,Serif,18,&Hffffff,&Hffffff,&Hff000000,&Hff000000,0,0,0,0,10= 0,100,0,0,1,1,0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2 index d740fbc365..f4e46e48e9 100644 --- a/tests/ref/fate/sub-mpl2 +++ b/tests/ref/fate/sub-mpl2 @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub index 4c3d37fa42..28c36ea40c 100644 --- a/tests/ref/fate/sub-mpsub +++ b/tests/ref/fate/sub-mpsub @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-fra= mes index 4f69e68948..44a23b273a 100644 --- a/tests/ref/fate/sub-mpsub-frames +++ b/tests/ref/fate/sub-mpsub-frames @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs index a327205143..0eb6880a14 100644 --- a/tests/ref/fate/sub-pjs +++ b/tests/ref/fate/sub-pjs @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext index d80db64daf..347a8c0eab 100644 --- a/tests/ref/fate/sub-realtext +++ b/tests/ref/fate/sub-realtext @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami index 3f194bdd02..7c1eff3bcc 100644 --- a/tests/ref/fate/sub-sami +++ b/tests/ref/fate/sub-sami @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-sami2 b/tests/ref/fate/sub-sami2 index bab07e4c07..9b5dcbe7a2 100644 --- a/tests/ref/fate/sub-sami2 +++ b/tests/ref/fate/sub-sami2 @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-scc b/tests/ref/fate/sub-scc index ff667eb4ec..a9ff3676be 100644 --- a/tests/ref/fate/sub-scc +++ b/tests/ref/fate/sub-scc @@ -8,7 +8,7 @@ YCbCr Matrix: None =20 [V4+ Styles] Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,0 +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,= 3,1,0,2,10,10,10,1 =20 [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt index a6ed4f31df..7449090fd0 100644 --- a/tests/ref/fate/sub-srt +++ b/tests/ref/fate/sub-srt @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-srt-badsyntax b/tests/ref/fate/sub-srt-bads= yntax index 27bdd48c40..b77cada3f5 100644 --- a/tests/ref/fate/sub-srt-badsyntax +++ b/tests/ref/fate/sub-srt-badsyntax @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-stl b/tests/ref/fate/sub-stl index 3e847a68be..3bf1f0d43f 100644 --- a/tests/ref/fate/sub-stl +++ b/tests/ref/fate/sub-stl @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer index e910e154ba..b3d69bfd1f 100644 --- a/tests/ref/fate/sub-subviewer +++ b/tests/ref/fate/sub-subviewer @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1 index 2d253288e1..4c19890ff1 100644 --- a/tests/ref/fate/sub-subviewer1 +++ b/tests/ref/fate/sub-subviewer1 @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer index ef9cb2d9e5..3949a2be89 100644 --- a/tests/ref/fate/sub-vplayer +++ b/tests/ref/fate/sub-vplayer @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt index 091cfb5d3f..2317c7d5a0 100644 --- a/tests/ref/fate/sub-webvtt +++ b/tests/ref/fate/sub-webvtt @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2 index 56afed8944..1d236eabdc 100644 --- a/tests/ref/fate/sub-webvtt2 +++ b/tests/ref/fate/sub-webvtt2 @@ -8,7 +8,7 @@ YCbCr Matrix: None =0D [V4+ Styles]=0D Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineC= olour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spac= ing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, Marg= inV, Encoding=0D -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,0=0D +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,= 0,2,10,10,10,1=0D =0D [Events]=0D Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect,= Text=0D --=20 2.30.2 --cu6bbacIFJHGWJA0-- --vo8OQaIe57hwPGyw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE3a/BnkayrS1rJvhDl6CODP/XCVEFAmNxUD0ACgkQl6CODP/X CVGg6A/9GI1zVzPjIaeseBuKhGf/jQSwb74mtZfAbgsuBFKWrWOJFjrn9e1CB1WH dkJ5HWKBvVMkNkT+/kdcojFTkiJypk6zMQ1CRutSA4y4BPKIbpBFSQ1OwjOSreAo I3cHT8GgjORJkEGVZOBly0txB6q5D+wUky06MTtvz5NM+Qzyb0w1e7rdKqSogZn+ 97XL1Rt+RSq0Gbx6myYbBYAE9Q5tQI5mc4qlUIvFI7JByn8PNTFILbw5loZdkazb ArryebbZmnWYQ5MC/fwCsvykUm7+k9WHEtvn2523g7ECfS93KDBxW2EPOeAnllih z0bkPX3R0LrNj2CZjEQi6ZT1flg1IgnNPsOXTz8Bq1g6OoocEqiTvFL88Yg9nXwz u+sle6VOpMS0IWxGilxO47VTpTQXJELCJ2H9gZD57GkVa0G2vvhEur/Yc/7vJnwK zAsHGrZJ2HfXNdVRpsI9hwL29qfW8A9n9vcQutnzka4QKJsBtnJJx7X8UmaG4iJT N5PXQ6rUoAYIwq/ucAU29bfPcYwBg4hhDN9gRKzDvQv+CDshRmr8QbhZoP+QeHU9 FbgBUcUOm+ibLvBrutt+LTbnq7ME/cISWuDOzab86gj3E/cIkuHg8m2UhDoqh66R XcfE9eIeVyVCo6nNr10RuPyvsv06RmVZrQV9yIcHWLKkRYdhepM= =+nPg -----END PGP SIGNATURE----- --vo8OQaIe57hwPGyw-- --===============3651393392550520324== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============3651393392550520324==--