aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2020-12-24 13:16:44 +0100
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2020-12-24 13:16:44 +0100
commit2943c3debd611c0f37f8ff5eafb34ed369009a9c (patch)
treed63fde13d15f9af994edd371a1f66ae60a5df6bd /libavformat
parentb0a882cc93eb659d3e564b07f4c1f3eb87684bda (diff)
downloadffmpeg-2943c3debd611c0f37f8ff5eafb34ed369009a9c.tar.gz
lavf/img2dec: Increase score for very large jpeg images.
Avoids a conflict with the raw mjpeg demuxer.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/img2dec.c2
1 files changed, 1 insertions, 1 deletions
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)