diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-06 18:20:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-07 00:37:03 +0200 |
| commit | 78fb7355c84ea5796ecdd0266a436e8111f085ce (patch) | |
| tree | d47c3c6c62e3ac932110ef5fc0d9513915563a9d /libavcodec | |
| parent | ec43d63cf491d9ef58c1a406258c008300eb7255 (diff) | |
| download | ffmpeg-78fb7355c84ea5796ecdd0266a436e8111f085ce.tar.gz | |
mjpegdec; even better RSTn skiping
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5cec91d21a..b895149cd8 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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) |