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 01:07:37 +0200 |
| commit | 374409eb1a640abde877bb55d2e8a1e65083699a (patch) | |
| tree | abf4584b5f1122c6f146ff65dfb65b807379c712 /libavcodec | |
| parent | a352fedb2415368a032a348dcd038624637197fa (diff) | |
| download | ffmpeg-374409eb1a640abde877bb55d2e8a1e65083699a.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 cb5bc2387f..e64ea5cd68 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) |