jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 23:53:13 +0000 (01:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 01:10:08 +0000 (03:10 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c

index abd93ef..c2a8d6a 100644 (file)
@@ -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;