Commit 08326e73 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered

Fixes Ticket4635
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3a6a8f6e
...@@ -1119,13 +1119,13 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile ...@@ -1119,13 +1119,13 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
precno = prcx + rlevel->num_precincts_x * prcy; precno = prcx + rlevel->num_precincts_x * prcy;
ok_reslevel = 1;
if (prcx >= rlevel->num_precincts_x || prcy >= rlevel->num_precincts_y) { if (prcx >= rlevel->num_precincts_x || prcy >= rlevel->num_precincts_y) {
av_log(s->avctx, AV_LOG_WARNING, "prc %d %d outside limits %d %d\n", av_log(s->avctx, AV_LOG_WARNING, "prc %d %d outside limits %d %d\n",
prcx, prcy, rlevel->num_precincts_x, rlevel->num_precincts_y); prcx, prcy, rlevel->num_precincts_x, rlevel->num_precincts_y);
continue; continue;
} }
ok_reslevel = 1;
for (layno = 0; layno < tile->codsty[0].nlayers; layno++) { for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, if ((ret = jpeg2000_decode_packet(s, tile, &tp_index,
codsty, rlevel, codsty, rlevel,
......
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