From 61a84755a9602f315508cc6d2916ebd30e331d28 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 23 Sep 2012 04:49:59 +0200 Subject: [PATCH] lavf: dont open a decoder at the top of find_stream_info before probing has finished It could open the wrong decoder. Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0a79fe7eb7..0732c46177 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2557,7 +2557,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) : &thread_opt); //try to just open decoders, in case this is enough to get parameters - if (!has_codec_parameters(st, NULL)) { + if (!has_codec_parameters(st, NULL) && st->request_probe <= 0) { if (codec && !st->codec->codec) avcodec_open2(st->codec, codec, options ? &options[i] : &thread_opt);