highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-19 04:55:01 +01:00
parent b9bedb0b28
commit 8893f31e20
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegdec.c
View File

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