diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:55:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:57:03 +0100 |
| commit | 8893f31e206358d933abe4a5227b5ae89f5f303d (patch) | |
| tree | d06bc770746d3bea00b08d3c01153425363cccf7 /libavcodec/mjpegdec.c | |
| parent | b9bedb0b287d3aaa30540d18fdb87b2cc98ca339 (diff) | |
| download | ffmpeg-8893f31e206358d933abe4a5227b5ae89f5f303d.tar.gz | |
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>
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 d1ede3e2eb..ab4d2bab34 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; |