[FFmpeg-cvslog] avcodec/mjpegdec: update cur_scan also for non-LS jpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 04:55:01 2014 +0100| [8893f31e206358d933abe4a5227b5ae89f5f303d] | committer: Michael Niedermayer

avcodec/mjpegdec: update cur_scan also for non-LS jpeg

This should make no difference but the variable will be used in a subsequent commit

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mjpegdec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d1ede3e..ab4d2ba 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1732,8 +1732,6 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
         int t = 0, b = 0;
         PutBitContext pb;
 
-        s->cur_scan++;
-
         /* find marker */
         while (src + t < buf_end) {
             uint8_t x = src[t++];
@@ -1924,6 +1922,7 @@ eoi_parser:
 
             goto the_end;
         case SOS:
+            s->cur_scan++;
             if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
                 (avctx->err_recognition & AV_EF_EXPLODE))
                 goto fail;