summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-29 11:58:16 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-29 11:58:16 +0100
commitc0ecc597fa966afef8703be72a0689f6074a858d (patch)
tree4b41828cdbb87a5540cef972987edc4701275b0c
parent98084adccf14afb087737f41ced74c492b9a73ac (diff)
downloadffmpeg-streaming-c0ecc597fa966afef8703be72a0689f6074a858d.zip
ffmpeg-streaming-c0ecc597fa966afef8703be72a0689f6074a858d.tar.gz
lavf/img2dec: Skip SOS when auto-detecting jpeg.
Improves jpeg auto-detection.
-rw-r--r--libavformat/img2dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 28a1fdb..94cce93 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -715,6 +715,7 @@ static int jpeg_probe(AVProbeData *p)
state = 0xC0;
break;
case 0xDA:
+ i += AV_RB16(&b[i + 2]) + 1;
if (state != 0xC0 && state != 0xDA)
return 0;
state = 0xDA;
OpenPOWER on IntegriCloud