From b61097fe0dc20d442be4fdbaf9bd97e2769d7f43 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 27 Dec 2012 17:39:10 +0100 Subject: mjpegdec: reset restart_count on progressive scans Fixes Ticket2068 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec') diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 71edc91ef6..c1712ea47a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1134,6 +1134,8 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, if (s->interlaced && s->bottom_field) data += linesize >> 1; + s->restart_count = 0; + for (mb_y = 0; mb_y < s->mb_height; mb_y++) { uint8_t *ptr = data + (mb_y * linesize * 8 >> s->avctx->lowres); int block_idx = mb_y * s->block_stride[c]; -- cgit v1.2.3