Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-18 03:22:45 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-06-18 03:23:37 +0300
commit08326e73a234fd0832bbf34b8b951352c17414c7 (patch)
tree5437bdc7c7de8ec1faf6ff67e88472b4775cd7d5 /libavcodec/jpeg2000dec.c
parent3a6a8f6ee1cb619913b87b6c78e0436303e2a35f (diff)
avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered
Fixes Ticket4635 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
-rw-r--r--libavcodec/jpeg2000dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 35535423da..4d82340037 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1119,13 +1119,13 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
precno = prcx + rlevel->num_precincts_x * prcy;
+ ok_reslevel = 1;
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",
prcx, prcy, rlevel->num_precincts_x, rlevel->num_precincts_y);
continue;
}
- ok_reslevel = 1;
for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index,
codsty, rlevel,