From fd7e1190379db1b2b3eaa31c00dc9c92803faef3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 31 May 2013 01:53:13 +0200 Subject: [PATCH] jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index abd93ef7cf..c2a8d6ac43 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -669,12 +669,10 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) { int layno, reslevelno, compno, precno, ok_reslevel; - uint8_t prog_order = tile->codsty[0].prog_order; - uint16_t x; - uint16_t y; + int x, y; s->bit_index = 8; - switch (prog_order) { + switch (tile->codsty[0].prog_order) { case JPEG2000_PGOD_LRCP: for (layno = 0; layno < tile->codsty[0].nlayers; layno++) { ok_reslevel = 1;