[FFmpeg-cvslog] lavf/img2dec: Skip SOS when auto-detecting jpeg.

Carl Eugen Hoyos git at videolan.org
Mon Feb 29 12:00:15 CET 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Feb 29 11:58:16 2016 +0100| [c0ecc597fa966afef8703be72a0689f6074a858d] | committer: Carl Eugen Hoyos

lavf/img2dec: Skip SOS when auto-detecting jpeg.

Improves jpeg auto-detection.

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

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

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;



More information about the ffmpeg-cvslog mailing list