highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mjpegdec; even better RSTn skiping

Browse Source 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a)
This commit is contained in:
Michael Niedermayer 2011-09-06 18:20:34 +02:00 committed by Carl Eugen Hoyos
parent a352fedb24
commit 374409eb1a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegdec.c
View File

@ -882,7 +882,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)