]> git.sesse.net Git - ffmpeg/commitdiff
lavf/img2dec: Increase score for very large jpeg images.
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>
Thu, 24 Dec 2020 12:16:44 +0000 (13:16 +0100)
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>
Thu, 24 Dec 2020 12:16:44 +0000 (13:16 +0100)
Avoids a conflict with the raw mjpeg demuxer.

libavformat/img2dec.c

index ccb933ae33eae31b39b103b9d9f6575f79ed9aff..1279d47f54ff093fba43125a25f1b0497633e891 100644 (file)
@@ -817,7 +817,7 @@ static int jpeg_probe(const AVProbeData *p)
         return AVPROBE_SCORE_EXTENSION + 1;
     if (state == SOS)
         return AVPROBE_SCORE_EXTENSION / 2;
-    return AVPROBE_SCORE_EXTENSION / 8;
+    return AVPROBE_SCORE_EXTENSION / 8 + 1;
 }
 
 static int jpegls_probe(const AVProbeData *p)