From 011169cd41ec6004a61611a9efba0b6778d78ff6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 26 Dec 2012 20:23:09 +0100 Subject: [PATCH] mjpegdec: handle the occurance of rstn emulation Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2ad1e2d78b..71edc91ef6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -740,7 +740,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) i = 8 + ((-get_bits_count(&s->gb)) & 7); /* skip RSTn */ - if (show_bits(&s->gb, i) == (1 << i) - 1) { + if (s->restart_count == 0 && show_bits(&s->gb, i) == (1 << i) - 1) { int pos = get_bits_count(&s->gb); align_get_bits(&s->gb); while (get_bits_left(&s->gb) >= 8 && show_bits(&s->gb, 8) == 0xFF)