Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 0/1] Fix document mistake for lavc/libaribcaption
@ 2023-11-01 15:03 zheng qian
  2023-11-01 15:03 ` [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi zheng qian
  2023-11-01 15:24 ` [FFmpeg-devel] [PATCH v2] " zheng qian
  0 siblings, 2 replies; 7+ messages in thread
From: zheng qian @ 2023-11-01 15:03 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: zheng qian

Hi, I'm fixing a mistake contained in the document for lavc/libaribcaption.
This affects the 6.1 release so please also cheery-pick this patch to 6.1.

zheng qian (1):
  lavc/libaribcaption: Fix mistake in document decoders.texi

 doc/decoders.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.39.1

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-01 15:03 [FFmpeg-devel] [PATCH 0/1] Fix document mistake for lavc/libaribcaption zheng qian
@ 2023-11-01 15:03 ` zheng qian
  2023-11-01 15:13   ` Gyan Doshi
  2023-11-01 15:24 ` [FFmpeg-devel] [PATCH v2] " zheng qian
  1 sibling, 1 reply; 7+ messages in thread
From: zheng qian @ 2023-11-01 15:03 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: zheng qian

Fix the mistake in the description of `-caption_encoding encoding_scheme` option.

Signed-off-by: zheng qian <xqq@xqq.im>
---
 doc/decoders.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/decoders.texi b/doc/decoders.texi
index eb00e2a9e9..59279bde24 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -403,8 +403,8 @@ 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.
+The default is @dfn{auto} which tries to determine text encoding automatically.
+You can specify a specific encoding scheme if the source of the broadcast is known.
 
 @item -font @var{font_name[,font_name2,...]}
 Specify comma-separated list of font family names to be used for @dfn{bitmap}
-- 
2.39.1

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-01 15:03 ` [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi zheng qian
@ 2023-11-01 15:13   ` Gyan Doshi
  0 siblings, 0 replies; 7+ messages in thread
From: Gyan Doshi @ 2023-11-01 15:13 UTC (permalink / raw)
  To: ffmpeg-devel



On 2023-11-01 08:33 pm, zheng qian wrote:
> Fix the mistake in the description of `-caption_encoding encoding_scheme` option.
>
> Signed-off-by: zheng qian<xqq@xqq.im>
> ---
>   doc/decoders.texi | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/doc/decoders.texi b/doc/decoders.texi
> index eb00e2a9e9..59279bde24 100644
> --- a/doc/decoders.texi
> +++ b/doc/decoders.texi
> @@ -403,8 +403,8 @@ 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.
> +The default is @dfn{auto} which tries to determine text encoding automatically.

Convention is simply to add default in the default value's description i.e.

"
@item auto
Automatically detect text encoding (default).
"

> +You can specify a specific encoding scheme if the source of the broadcast is known.
This line can go.

Regards,
Gyan
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [FFmpeg-devel] [PATCH v2] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-01 15:03 [FFmpeg-devel] [PATCH 0/1] Fix document mistake for lavc/libaribcaption zheng qian
  2023-11-01 15:03 ` [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi zheng qian
@ 2023-11-01 15:24 ` zheng qian
  2023-11-01 19:51   ` Gyan Doshi
  1 sibling, 1 reply; 7+ messages in thread
From: zheng qian @ 2023-11-01 15:24 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: zheng qian

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(-)

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.
-- 
2.39.1

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [FFmpeg-devel] [PATCH v2] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-01 15:24 ` [FFmpeg-devel] [PATCH v2] " zheng qian
@ 2023-11-01 19:51   ` Gyan Doshi
  2023-11-02  8:40     ` Gyan Doshi
  0 siblings, 1 reply; 7+ messages in thread
From: Gyan Doshi @ 2023-11-01 19:51 UTC (permalink / raw)
  To: ffmpeg-devel



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.

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [FFmpeg-devel] [PATCH v2] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-01 19:51   ` Gyan Doshi
@ 2023-11-02  8:40     ` Gyan Doshi
  2023-11-02  9:01       ` zheng qian
  0 siblings, 1 reply; 7+ messages in thread
From: Gyan Doshi @ 2023-11-02  8:40 UTC (permalink / raw)
  To: ffmpeg-devel



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".
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [FFmpeg-devel] [PATCH v2] lavc/libaribcaption: Fix mistake in document decoders.texi
  2023-11-02  8:40     ` Gyan Doshi
@ 2023-11-02  9:01       ` zheng qian
  0 siblings, 0 replies; 7+ messages in thread
From: zheng qian @ 2023-11-02  9:01 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

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".
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-11-02  9:01 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-01 15:03 [FFmpeg-devel] [PATCH 0/1] Fix document mistake for lavc/libaribcaption zheng qian
2023-11-01 15:03 ` [FFmpeg-devel] [PATCH 1/1] lavc/libaribcaption: Fix mistake in document decoders.texi zheng qian
2023-11-01 15:13   ` Gyan Doshi
2023-11-01 15:24 ` [FFmpeg-devel] [PATCH v2] " zheng qian
2023-11-01 19:51   ` Gyan Doshi
2023-11-02  8:40     ` Gyan Doshi
2023-11-02  9:01       ` zheng qian

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git