diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-22 12:10:15 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-23 11:16:26 +0200 |
| commit | 9777ba33f52c54cc982f977ce28e5d4b55927b72 (patch) | |
| tree | 50d0584bd1c64dc2c12a2d8a72d92fb99b253bd8 | |
| parent | 30d3e36a46028d6d4aec5070d1fff89f8af5f9d9 (diff) | |
| download | ffmpeg-9777ba33f52c54cc982f977ce28e5d4b55927b72.tar.gz | |
avformat/utils: avoid using marked decoders for probing
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/utils.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 05d2315930..93ea6ff7f7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -188,6 +188,8 @@ FF_ENABLE_DEPRECATION_WARNINGS static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, enum AVCodecID codec_id) { + const AVCodec *codec; + #if CONFIG_H264_DECODER /* Other parts of the code assume this decoder to be used for h264, * so force it if possible. */ @@ -195,7 +197,22 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, return avcodec_find_decoder_by_name("h264"); #endif - return find_decoder(s, st, codec_id); + codec = find_decoder(s, st, codec_id); + if (!codec) + return NULL; + + if (codec->capabilities & AV_CODEC_CAP_AVOID_PROBING) { + const AVCodec *probe_codec = NULL; + while (probe_codec = av_codec_next(probe_codec)) { + if (probe_codec->id == codec_id && + av_codec_is_decoder(probe_codec) && + !(probe_codec->capabilities & (AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_EXPERIMENTAL))) { + return probe_codec; + } + } + } + + return codec; } int av_format_get_probe_score(const AVFormatContext *s) |