From be7eed72c89368de70dbf8749eca1dac7443e51a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 6 Sep 2011 18:20:34 +0200 Subject: [PATCH] mjpegdec; even better RSTn skiping Fixes Ticket426 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index cb0c692e6f..b2e063fb4b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -894,7 +894,8 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i } if (s->restart_interval) --s->restart_count; - if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){ /* skip RSTn */ + i= 8+((-get_bits_count(&s->gb))&7); + if (s->restart_interval && show_bits(&s->gb, i) == (1<gb); align_get_bits(&s->gb); while(show_bits(&s->gb, 8) == 0xFF)