jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · fd7e119037
parent 192050d7a7
commit fd7e119037
1 changed files with 2 additions and 4 deletions
--- 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;