From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 26 Feb 2016 08:53:29 +0000 (+0100)
Subject: lavf/img2dec: Skip SOF size when probing jpeg.
X-Git-Tag: android-x86-7.1-r1~6234
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07eec5e721cc3657ac361b33f42c442769518b0d;p=android-x86%2Fexternal-ffmpeg.git

lavf/img2dec: Skip SOF size when probing jpeg.

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

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index a755b6fa60..28a1fdbfcc 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;