aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-06 18:20:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-06 18:20:34 +0200
commitbe7eed72c89368de70dbf8749eca1dac7443e51a (patch)
tree43f54ebd6b888320228a2addadce76fed6c7f126
parentbc6445f2dbd004565adda0c500754cc9ee151aed (diff)
downloadffmpeg-be7eed72c89368de70dbf8749eca1dac7443e51a.tar.gz
mjpegdec; even better RSTn skiping
Fixes Ticket426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 2 insertions, 1 deletions
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<<i)-1){ /* skip RSTn */
int pos= get_bits_count(&s->gb);
align_get_bits(&s->gb);
while(show_bits(&s->gb, 8) == 0xFF)