Commit 3c24fbbf authored by Michael Niedermayer's avatar Michael Niedermayer

jpegdec: be less picky on padding

Fixes Ticket2353
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b76d8536
...@@ -742,7 +742,9 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) ...@@ -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)
...@@ -752,6 +754,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components) ...@@ -752,6 +754,7 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components)
s->last_dc[i] = 1024; s->last_dc[i] = 1024;
} else } else
skip_bits_long(&s->gb, pos - get_bits_count(&s->gb)); skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment