[FFmpeg-cvslog] lavf/img2dec: Skip SOF size when probing jpeg.

Carl Eugen Hoyos git at videolan.org
Fri Feb 26 09:56:25 CET 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Feb 26 09:53:29 2016 +0100| [07eec5e721cc3657ac361b33f42c442769518b0d] | committer: Carl Eugen Hoyos

lavf/img2dec: Skip SOF size when probing jpeg.

Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch

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

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

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;



More information about the ffmpeg-cvslog mailing list