From 1843e6c8aa9752aa7d500f8a2a0f072cf3a3aee0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 14 Jan 2012 23:30:01 +0100 Subject: [PATCH] thp: Fix handling of restart interval Fixes Ticket903 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 64e5839231..d3bcb6fd27 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1048,6 +1048,12 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, if (s->restart_interval) { s->restart_count--; + if(s->restart_count == 0 && s->avctx->codec_id == CODEC_ID_THP){ + align_get_bits(&s->gb); + for (i = 0; i < nb_components; i++) /* reset dc */ + s->last_dc[i] = 1024; + } + i = 8 + ((-get_bits_count(&s->gb)) & 7); /* skip RSTn */ if (show_bits(&s->gb, i) == (1 << i) - 1) {