[FFmpeg-cvslog] fftools/ffmpeg_opt: drop redundant decoder selection

Anton Khirnov git at videolan.org
Mon Aug 8 17:27:16 EEST 2022


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Aug  3 10:30:54 2022 +0200| [4f2b946c194249b016f12fe57e86722ca399cd7f] | committer: Anton Khirnov

fftools/ffmpeg_opt: drop redundant decoder selection

A decoder is already selected above, in choose_decoder().

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

 fftools/ffmpeg_opt.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index aa240107dc..12cde4b617 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -1078,9 +1078,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
 
         switch (par->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
-            if(!ist->dec)
-                ist->dec = avcodec_find_decoder(par->codec_id);
-
             // avformat_find_stream_info() doesn't set this for us anymore.
             ist->dec_ctx->framerate = st->avg_frame_rate;
 
@@ -1104,8 +1101,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
         case AVMEDIA_TYPE_DATA:
         case AVMEDIA_TYPE_SUBTITLE: {
             char *canvas_size = NULL;
-            if(!ist->dec)
-                ist->dec = avcodec_find_decoder(par->codec_id);
             MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st);
             MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st);
             if (canvas_size &&



More information about the ffmpeg-cvslog mailing list