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

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep 13 13:16:39 2021 +0200| [3b6c25c9256072f4517a05e61fe61b6d1afe1021] | committer: Andreas Rheinhardt

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 at hotmail.com>
Reviewed-by: Soft Works <softworkz at hotmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b6c25c9256072f4517a05e61fe61b6d1afe1021
---

 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 5365f711e5..98c2421938 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2991,8 +2991,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) {