| Message ID | 20231101152421.70296-1-xqq@xqq.im |
|---|---|
| State | Accepted |
| Commit | 4dbfb52230c4993e58598386ac79b964589dc00e |
| Headers | show |
| Series | [FFmpeg-devel,v2] lavc/libaribcaption: Fix mistake in document decoders.texi | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 2023-11-01 08:54 pm, zheng qian wrote: > Fix the mistake in the description of `-caption_encoding encoding_scheme` option. Will fix commit message and push. Thanks, Gyan > > Signed-off-by: zheng qian <xqq@xqq.im> > --- > doc/decoders.texi | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/doc/decoders.texi b/doc/decoders.texi > index eb00e2a9e9..f75364166e 100644 > --- a/doc/decoders.texi > +++ b/doc/decoders.texi > @@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle text. > > @table @samp > @item auto > -Automatically detect text encoding. > +Automatically detect text encoding (default). > @item jis > 8bit-char JIS encoding defined in ARIB STD B24. > This encoding used in Japan for ISDB captions. > @@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR 15606-1. > This encoding is used in South America for SBTVD / ISDB-Tb captions. > @end table > > -The default is @dfn{ass} as same as @dfn{libaribb24} decoder. > -Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption. > - > @item -font @var{font_name[,font_name2,...]} > Specify comma-separated list of font family names to be used for @dfn{bitmap} > or @dfn{ass} type subtitle rendering.
On 2023-11-02 01:21 am, Gyan Doshi wrote: > > > On 2023-11-01 08:54 pm, zheng qian wrote: >> Fix the mistake in the description of `-caption_encoding >> encoding_scheme` option. > Will fix commit message and push. Pushed as 4dbfb52230c4993e58598386ac79b964589dc00e and 80daebdfdff48dc5ad7c1a704d885c215168e214 Regards, Gyan > >> >> Signed-off-by: zheng qian <xqq@xqq.im> >> --- >> doc/decoders.texi | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/doc/decoders.texi b/doc/decoders.texi >> index eb00e2a9e9..f75364166e 100644 >> --- a/doc/decoders.texi >> +++ b/doc/decoders.texi >> @@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle >> text. >> @table @samp >> @item auto >> -Automatically detect text encoding. >> +Automatically detect text encoding (default). >> @item jis >> 8bit-char JIS encoding defined in ARIB STD B24. >> This encoding used in Japan for ISDB captions. >> @@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR >> 15606-1. >> This encoding is used in South America for SBTVD / ISDB-Tb captions. >> @end table >> -The default is @dfn{ass} as same as @dfn{libaribb24} decoder. >> -Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB >> caption. >> - >> @item -font @var{font_name[,font_name2,...]} >> Specify comma-separated list of font family names to be used for >> @dfn{bitmap} >> or @dfn{ass} type subtitle rendering. > > _______________________________________________ > 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".
On Thu, Nov 2, 2023 at 5:40 PM Gyan Doshi <ffmpeg@gyani.pro> wrote: > > > > On 2023-11-02 01:21 am, Gyan Doshi wrote: > > > > > > On 2023-11-01 08:54 pm, zheng qian wrote: > >> Fix the mistake in the description of `-caption_encoding > >> encoding_scheme` option. > > Will fix commit message and push. > > Pushed as 4dbfb52230c4993e58598386ac79b964589dc00e and > 80daebdfdff48dc5ad7c1a704d885c215168e214 Thanks. Regards, xqq > > Regards, Gyan > > > >> > >> Signed-off-by: zheng qian <xqq@xqq.im> > >> --- > >> doc/decoders.texi | 5 +---- > >> 1 file changed, 1 insertion(+), 4 deletions(-) > >> > >> diff --git a/doc/decoders.texi b/doc/decoders.texi > >> index eb00e2a9e9..f75364166e 100644 > >> --- a/doc/decoders.texi > >> +++ b/doc/decoders.texi > >> @@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle > >> text. > >> @table @samp > >> @item auto > >> -Automatically detect text encoding. > >> +Automatically detect text encoding (default). > >> @item jis > >> 8bit-char JIS encoding defined in ARIB STD B24. > >> This encoding used in Japan for ISDB captions. > >> @@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR > >> 15606-1. > >> This encoding is used in South America for SBTVD / ISDB-Tb captions. > >> @end table > >> -The default is @dfn{ass} as same as @dfn{libaribb24} decoder. > >> -Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB > >> caption. > >> - > >> @item -font @var{font_name[,font_name2,...]} > >> Specify comma-separated list of font family names to be used for > >> @dfn{bitmap} > >> or @dfn{ass} type subtitle rendering. > > > > _______________________________________________ > > 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". > _______________________________________________ > 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".
diff --git a/doc/decoders.texi b/doc/decoders.texi index eb00e2a9e9..f75364166e 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle text. @table @samp @item auto -Automatically detect text encoding. +Automatically detect text encoding (default). @item jis 8bit-char JIS encoding defined in ARIB STD B24. This encoding used in Japan for ISDB captions. @@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR 15606-1. This encoding is used in South America for SBTVD / ISDB-Tb captions. @end table -The default is @dfn{ass} as same as @dfn{libaribb24} decoder. -Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption. - @item -font @var{font_name[,font_name2,...]} Specify comma-separated list of font family names to be used for @dfn{bitmap} or @dfn{ass} type subtitle rendering.
Fix the mistake in the description of `-caption_encoding encoding_scheme` option. Signed-off-by: zheng qian <xqq@xqq.im> --- doc/decoders.texi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)