From 2898526d6a96c5b855d2dbabb7e73295959393ae Mon Sep 17 00:00:00 2001 From: Jean-Daniel Dupas Date: Tue, 13 Apr 2010 07:25:50 +0000 Subject: [PATCH] Do not probe when the format is known. Patch by Jean-Daniel Dupas devlists shadowlab org Originally committed as revision 22870 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 20316af64b..445434c277 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -559,7 +559,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, if (buf_size > 0) { url_setbufsize(pb, buf_size); } - if ((err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { + if (!fmt && (err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { goto fail; } }