diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 20:23:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 20:43:56 +0100 |
| commit | 011169cd41ec6004a61611a9efba0b6778d78ff6 (patch) | |
| tree | ea9623f4c2ebea5e918cac3d37dc9f2f14fcfec2 /libavcodec | |
| parent | 5ff8ca1f04e75ad6c1934f3818c01d1e9bda8456 (diff) | |
mjpegdec: handle the occurance of rstn emulation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2ad1e2d78b..71edc91ef6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -740,7 +740,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) i = 8 + ((-get_bits_count(&s->gb)) & 7); /* skip RSTn */ - if (show_bits(&s->gb, i) == (1 << i) - 1) { + if (s->restart_count == 0 && show_bits(&s->gb, i) == (1 << i) - 1) { int pos = get_bits_count(&s->gb); align_get_bits(&s->gb); while (get_bits_left(&s->gb) >= 8 && show_bits(&s->gb, 8) == 0xFF) |