aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-09 23:46:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-09 23:49:06 +0200
commit233177a4ec68bddf6df865936bc3c630d8d9ec58 (patch)
tree518a5e6e288ea566839acbbe29491d6005f7042c
parent1c032e94d0a529a424ffeb1fb7287c2c93d0be6a (diff)
downloadffmpeg-233177a4ec68bddf6df865936bc3c630d8d9ec58.tar.gz
jpegdec: clear EOBRUN on restarts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 565580e8cb..dac8386037 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1180,7 +1180,8 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
s->dsp.idct_put(ptr, linesize, *block);
ptr += 8 >> s->avctx->lowres;
}
- handle_rstn(s, 0);
+ if (handle_rstn(s, 0))
+ EOBRUN = 0;
}
}
return 0;