diff mbox series

[FFmpeg-devel,08/10] avfilter/vf_subtitles, fftools/ffmpeg: Don't set sub_text_format

Message ID AM7PR03MB6660715AEB34BDB96AA4DE058FD99@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 3b6c25c9256072f4517a05e61fe61b6d1afe1021
Headers show
Series [FFmpeg-devel,01/10] avcodec/mpegvideo: Move startcodes to mpeg12.h
Related show

Checks

Context Check Description
andriy/commit_msg_x86 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/commit_msg_ppc warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 13, 2021, 1:53 p.m. UTC
Unnecessary since 1f63665ca567fbc49fa80166d468a822c2999efa, because
the value the option is set to coincides with the default value.

Found-by: Soft Works <softworkz@hotmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/ffmpeg.c           | 2 --
 libavfilter/vf_subtitles.c | 1 -
 2 files changed, 3 deletions(-)

Comments

Soft Works Sept. 13, 2021, 5:35 p.m. UTC | #1
> -----Original Message-----
> From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Sent: Monday, 13 September 2021 15:54
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>; Soft Works
> <softworkz@hotmail.com>
> Subject: [PATCH 08/10] avfilter/vf_subtitles, fftools/ffmpeg: Don't
> set sub_text_format
> 
> Unnecessary since 1f63665ca567fbc49fa80166d468a822c2999efa, because
> the value the option is set to coincides with the default value.
> 
> Found-by: Soft Works <softworkz@hotmail.com>

Wouldn't have been necessary, yet nice :-)

> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  fftools/ffmpeg.c           | 2 --
>  libavfilter/vf_subtitles.c | 1 -
>  2 files changed, 3 deletions(-)
> 
> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> index a9bb9d964d..4b6a6c7fa6 100644
> --- a/fftools/ffmpeg.c
> +++ b/fftools/ffmpeg.c
> @@ -2983,8 +2983,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
>                  av_log(NULL, AV_LOG_WARNING, "Warning using DVB
> subtitles for filtering and output at the same time is not fully
> supported, also see -compute_edt [0|1]\n");
>          }
> 
> -        av_dict_set(&ist->decoder_opts, "sub_text_format", "ass",
> AV_DICT_DONT_OVERWRITE);
> -
>          /* Useful for subtitles retiming by lavf (FIXME), skipping
> samples in
>           * audio, and video decoders such as cuvid or mediacodec */
>          ist->dec_ctx->pkt_timebase = ist->st->time_base;
> diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
> index d0bafcd3cf..f08a7fba9d 100644
> --- a/libavfilter/vf_subtitles.c
> +++ b/libavfilter/vf_subtitles.c
> @@ -395,7 +395,6 @@ static av_cold int init_subtitles(AVFilterContext
> *ctx)
>      }
>      if (ass->charenc)
>          av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0);
> -    av_dict_set(&codec_opts, "sub_text_format", "ass", 0);
> 
>      dec_ctx = avcodec_alloc_context3(dec);
>      if (!dec_ctx) {
> --
> 2.30.2

LGTM.
diff mbox series

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index a9bb9d964d..4b6a6c7fa6 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2983,8 +2983,6 @@  FF_ENABLE_DEPRECATION_WARNINGS
                 av_log(NULL, AV_LOG_WARNING, "Warning using DVB subtitles for filtering and output at the same time is not fully supported, also see -compute_edt [0|1]\n");
         }
 
-        av_dict_set(&ist->decoder_opts, "sub_text_format", "ass", AV_DICT_DONT_OVERWRITE);
-
         /* Useful for subtitles retiming by lavf (FIXME), skipping samples in
          * audio, and video decoders such as cuvid or mediacodec */
         ist->dec_ctx->pkt_timebase = ist->st->time_base;
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index d0bafcd3cf..f08a7fba9d 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -395,7 +395,6 @@  static av_cold int init_subtitles(AVFilterContext *ctx)
     }
     if (ass->charenc)
         av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0);
-    av_dict_set(&codec_opts, "sub_text_format", "ass", 0);
 
     dec_ctx = avcodec_alloc_context3(dec);
     if (!dec_ctx) {