Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

[ffmpeg] / libavformat / format.c

diff --git a/libavformat/format.c b/libavformat/format.c
index 828ab52fc997167900b087bb26efc478d29bdbcc..1026c8f7a72dd672351385dee2c3aa290a398d0a 100644 (file)
--- 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) {
@@ -217,7 +217,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
                 score = AVPROBE_SCORE_EXTENSION;
         }
         if (av_match_name(lpd.mime_type, fmt1->mime_type))
-            score = FFMAX(score, AVPROBE_SCORE_EXTENSION);
+            score = FFMAX(score, AVPROBE_SCORE_MIME);
         if (score > score_max) {
             score_max = score;
             fmt       = fmt1;