From: Michael Niedermayer <[email protected]> In preparation of supporting multiple tiles.
Signed-off-by: Luca Barbato <[email protected]> --- libavcodec/jpeg2kdec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2kdec.c b/libavcodec/jpeg2kdec.c index 97749d8..878d6c7 100644 --- a/libavcodec/jpeg2kdec.c +++ b/libavcodec/jpeg2kdec.c @@ -1327,12 +1327,18 @@ static int jpeg2k_read_main_headers(Jpeg2KDecoderContext *s) static int jpeg2k_read_bitstream_packets(Jpeg2KDecoderContext *s) { int ret = 0; - Jpeg2KTile *tile = s->tile + s->curtileno; + int tileno; - if (ret = init_tile(s, s->curtileno)) - return ret; - if (ret = jpeg2k_decode_packets(s, tile)) - return ret; + for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) { + Jpeg2KTile *tile = s->tile + tileno; + + if (ret = init_tile(s, tileno)) + return ret; + + s->g = tile->tile_part[0].tpg; + if (ret = jpeg2k_decode_packets(s, tile)) + return ret; + } return 0; } -- 1.7.9.5 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
