diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 17:20:44 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-14 21:59:42 +0100 |
| commit | 7c6c5767eb6fc45a67dd7930fa5567b8c40d5950 (patch) | |
| tree | 2cfe6f2eea205342ef2b9bc44eb33cd02a018575 | |
| parent | 0ec869527c13fce6755bc6f6b07cb50138936449 (diff) | |
| download | ffmpeg-7c6c5767eb6fc45a67dd7930fa5567b8c40d5950.tar.gz | |
jpegdec: be less picky on padding
Fixes Ticket2353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3c24fbbf651d4ec28eccfd7ef05a2595a11dd55a)
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f3080d9aa0..54090e58d3 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -747,7 +747,9 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) i = 8 + ((-get_bits_count(&s->gb)) & 7); /* skip RSTn */ - if (s->restart_count == 0 && show_bits(&s->gb, i) == (1 << i) - 1) { + if (s->restart_count == 0) { + if( show_bits(&s->gb, i) == (1 << i) - 1 + || show_bits(&s->gb, i) == 0xFF) { 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) @@ -757,6 +759,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) s->last_dc[i] = 1024; } else skip_bits_long(&s->gb, pos - get_bits_count(&s->gb)); + } } } } |