diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-27 17:39:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-27 17:41:53 +0100 |
| commit | b61097fe0dc20d442be4fdbaf9bd97e2769d7f43 (patch) | |
| tree | d36f3084292f6788ab8e81fad9257a84357376a7 /libavcodec/mjpegdec.c | |
| parent | ae2b51acd2ac8c3714092b33c00c519d76a4cb4d (diff) | |
| download | ffmpeg-b61097fe0dc20d442be4fdbaf9bd97e2769d7f43.tar.gz | |
mjpegdec: reset restart_count on progressive scans
Fixes Ticket2068
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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]; |