[FFmpeg-cvslog] r22870 - trunk/libavformat/utils.c

[benoit]

Author: benoit
Date: Tue Apr 13 09:25:50 2010
New Revision: 22870

Log:
Do not probe when the format is known.
Patch by Jean-Daniel Dupas devlists shadowlab org

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Tue Apr 13 08:43:01 2010	(r22869)
+++ trunk/libavformat/utils.c	Tue Apr 13 09:25:50 2010	(r22870)
@@ -559,7 +559,7 @@ int av_open_input_file(AVFormatContext *
         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;
         }
     }