[FFmpeg-cvslog] avformat/format: Run image2 probe again when file content data is available

Michael Niedermayer git at videolan.org
Fri Sep 12 18:30:23 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 11 16:48:02 2014 +0200| [917d14e6a20d05a58eb65ba9c766997886199c46] | committer: Michael Niedermayer

avformat/format: Run image2 probe again when file content data is available

Reviewed-by: Benoit Fouet <benoit.fouet at free.fr>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=917d14e6a20d05a58eb65ba9c766997886199c46
---

 libavformat/format.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/format.c b/libavformat/format.c
index 828ab52..006cc87 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -202,7 +202,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
 
     fmt = NULL;
     while ((fmt1 = av_iformat_next(fmt1))) {
-        if (!is_opened == !(fmt1->flags & AVFMT_NOFILE))
+        if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) && strcmp(fmt1->name, "image2"))
             continue;
         score = 0;
         if (fmt1->read_probe) {



More information about the ffmpeg-cvslog mailing list