diff options
| author | Jean-Daniel Dupas <devlists@shadowlab.org> | 2010-04-13 07:25:50 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2010-04-13 07:25:50 +0000 |
| commit | 2898526d6a96c5b855d2dbabb7e73295959393ae (patch) | |
| tree | 0a5418f1c8e4e464fa37d5f28870579c0461d0fd /libavformat/utils.c | |
| parent | b0941dee3cf3f98389c0caa7c354bb52fa9ae3b6 (diff) | |
| download | ffmpeg-2898526d6a96c5b855d2dbabb7e73295959393ae.tar.gz | |
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
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |