mirror of https://git.ffmpeg.org/ffmpeg.git
lavf: always forward codec_whitelist in avformat_find_stream_info
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
parent
99ee8ee093
commit
ff5f4bd976
|
@ -3695,9 +3695,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
if (!has_codec_parameters(st, NULL)) {
|
if (!has_codec_parameters(st, NULL)) {
|
||||||
const AVCodec *codec = find_probe_decoder(ic, st, st->codecpar->codec_id);
|
const AVCodec *codec = find_probe_decoder(ic, st, st->codecpar->codec_id);
|
||||||
if (codec && !avctx->codec) {
|
if (codec && !avctx->codec) {
|
||||||
if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : NULL) < 0)
|
AVDictionary *opts = NULL;
|
||||||
|
if (ic->codec_whitelist)
|
||||||
|
av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0);
|
||||||
|
if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0)
|
||||||
av_log(ic, AV_LOG_WARNING,
|
av_log(ic, AV_LOG_WARNING,
|
||||||
"Failed to open codec in av_find_stream_info\n");
|
"Failed to open codec in av_find_stream_info\n");
|
||||||
|
av_dict_free(&opts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue