ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Wed Apr 14 21:56:50 2021 +0200| [a10c47acc29e5dc2c6b5278d0dcef225865f6341] | committer: Andreas Rheinhardt
avformat/utils: Combine identical statements This would only make a difference in case the first attempt to initialize the encoder failed and the second succeeded. The only reason I can think of for this to happen is that the options (in particular the codec whitelist) are not used for the second try and that obviously implies that we should not even try a second time to open the decoder. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a10c47acc29e5dc2c6b5278d0dcef225865f6341 --- libavformat/utils.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d9971d7fd3..d4ec3d0190 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3747,16 +3747,10 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ic->codec_whitelist) av_dict_set(options ? &options[i] : &thread_opt, "codec_whitelist", ic->codec_whitelist, 0); - /* Ensure that subtitle_header is properly set. */ - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE - && codec && !avctx->codec) { - if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) - av_log(ic, AV_LOG_WARNING, - "Failed to open codec in %s\n",__FUNCTION__); - } - // Try to just open decoders, in case this is enough to get parameters. - if (!has_codec_parameters(st, NULL) && st->internal->request_probe <= 0) { + // Also ensure that subtitle_header is properly set. + if (!has_codec_parameters(st, NULL) && st->internal->request_probe <= 0 || + st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (codec && !avctx->codec) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) av_log(ic, AV_LOG_WARNING, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
