summaryrefslogtreecommitdiffstats
path: root/libavformat/img2dec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-26 09:53:29 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-26 09:53:29 +0100
commit07eec5e721cc3657ac361b33f42c442769518b0d (patch)
treef98f1fafeb75466a40151f85a0e838900d17adeb /libavformat/img2dec.c
parent885a6d83247b76d4e58084440189620c6f22ca13 (diff)
downloadffmpeg-streaming-07eec5e721cc3657ac361b33f42c442769518b0d.zip
ffmpeg-streaming-07eec5e721cc3657ac361b33f42c442769518b0d.tar.gz
lavf/img2dec: Skip SOF size when probing jpeg.
Fixes auto-detection for some resolutions. Reported-by: Clément Bœsch
Diffstat (limited to 'libavformat/img2dec.c')
-rw-r--r--libavformat/img2dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index a755b6f..28a1fdb 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -709,6 +709,7 @@ static int jpeg_probe(AVProbeData *p)
case 0xC5:
case 0xC6:
case 0xC7:
+ i += AV_RB16(&b[i + 2]) + 1;
if (state != 0xD8)
return 0;
state = 0xC0;
OpenPOWER on IntegriCloud