[FFmpeg-cvslog] lavf/img2dec: Increase score for very large jpeg images.

Carl Eugen Hoyos git at videolan.org
Thu Dec 24 14:26:46 EET 2020


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Dec 24 13:16:44 2020 +0100| [2943c3debd611c0f37f8ff5eafb34ed369009a9c] | committer: Carl Eugen Hoyos

lavf/img2dec: Increase score for very large jpeg images.

Avoids a conflict with the raw mjpeg demuxer.

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

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

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index ccb933ae33..1279d47f54 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -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)



More information about the ffmpeg-cvslog mailing list