diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:55:01 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-19 14:27:40 +0100 |
| commit | 2c5c6affb1c32855f1452c914d35bc899f391c1f (patch) | |
| tree | 86a78460eaf6973e6722d2dc6de862ef8ef90355 /libavcodec/mjpegdec.c | |
| parent | f4e051680ec3af0d06234a3fd197b452499f9227 (diff) | |
| download | android_external_ffmpeg-2c5c6affb1c32855f1452c914d35bc899f391c1f.tar.gz android_external_ffmpeg-2c5c6affb1c32855f1452c914d35bc899f391c1f.tar.bz2 android_external_ffmpeg-2c5c6affb1c32855f1452c914d35bc899f391c1f.zip | |
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@gmx.at>
(cherry picked from commit 8893f31e206358d933abe4a5227b5ae89f5f303d)
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 398d758a8c..361f2992c1 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1735,8 +1735,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++]; @@ -1926,6 +1924,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; |