1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

mjpegdec; even better RSTn skiping

Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-06 18:20:34 +02:00
parent bc6445f2db
commit be7eed72c8

View File

@ -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) --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); int pos= get_bits_count(&s->gb);
align_get_bits(&s->gb); align_get_bits(&s->gb);
while(show_bits(&s->gb, 8) == 0xFF) while(show_bits(&s->gb, 8) == 0xFF)