summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-23 04:49:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-23 04:56:21 +0200
commit61a84755a9602f315508cc6d2916ebd30e331d28 (patch)
tree0b916f577a78bb17d012e170b0bcce58d82bdf07 /libavformat/utils.c
parent48cf0f1c18f2f91363601c94177c71bc3ac13b8e (diff)
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 <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
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);