ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

jpegdec: be less picky on padding

Browse Source 
Fixes Ticket2353

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-14 17:20:44 +01:00
parent b76d853697
commit 3c24fbbf65
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@ -742,7 +742,9 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components)
i = 8 + ((-get_bits_count(&s->gb)) & 7); i = 8 + ((-get_bits_count(&s->gb)) & 7);
/* skip RSTn */ /* 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); int pos = get_bits_count(&s->gb);
align_get_bits(&s->gb); align_get_bits(&s->gb);
while (get_bits_left(&s->gb) >= 8 && show_bits(&s->gb, 8) == 0xFF) while (get_bits_left(&s->gb) >= 8 && show_bits(&s->gb, 8) == 0xFF)
@ -754,6 +756,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components)
skip_bits_long(&s->gb, pos - get_bits_count(&s->gb)); skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
} }
} }
}
} }
static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int predictor, int point_transform) static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int predictor, int point_transform)