[FFmpeg-soc] [soc]: r1197 - in jpeg2000: j2kdec.c j2kenc.c

[k.nowosad]

Author: k.nowosad
Date: Mon Aug 27 11:31:51 2007
New Revision: 1197

Log:
remove unused variables; minor changes


Modified:
   jpeg2000/j2kdec.c
   jpeg2000/j2kenc.c

Modified: jpeg2000/j2kdec.c
==============================================================================
--- jpeg2000/j2kdec.c	(original)
+++ jpeg2000/j2kdec.c	Mon Aug 27 11:31:51 2007
@@ -436,7 +436,7 @@ static int init_tile(J2kDecoderContext *
         J2kComponent *comp = tile->comp + compno;
         J2kCodingStyle *codsty = tile->codsty + compno;
         J2kQuantStyle  *qntsty = tile->qntsty + compno;
-        int gbandno = 0, ret; // global bandno
+        int ret; // global bandno
 
         comp->coord[0][0] = FFMAX(tilex * s->tile_width + s->tile_offset_x, s->image_offset_x);
         comp->coord[0][1] = FFMIN((tilex+1)*s->tile_width + s->tile_offset_x, s->width);
@@ -514,8 +514,9 @@ static int decode_packet(J2kDecoderConte
                 if ((llen = getlblockinc(s)) < 0)
                     return llen;
                 cblk->lblock += llen;
-                if ((cblk->lengthinc = get_bits(s, av_log2(newpasses) + cblk->lblock)) < 0)
-                    return cblk->lengthinc;
+                if ((ret = get_bits(s, av_log2(newpasses) + cblk->lblock)) < 0)
+                    return ret;
+                cblk->lengthinc = ret;
                 cblk->npasses += newpasses;
             }
     }
@@ -679,7 +680,7 @@ static int decode_cblk(J2kDecoderContext
 
 static void mct_decode(J2kDecoderContext *s, J2kTile *tile)
 {
-    int i, j, *src[3], i0, i1, i2, csize = 1;
+    int i, *src[3], i0, i1, i2, csize = 1;
 
     for (i = 0; i < 3; i++)
         src[i] = tile->comp[i].data;

Modified: jpeg2000/j2kenc.c
==============================================================================
--- jpeg2000/j2kenc.c	(original)
+++ jpeg2000/j2kenc.c	Mon Aug 27 11:31:51 2007
@@ -614,8 +614,7 @@ static int encode_packet(J2kEncoderConte
         J2kBand *band = rlevel->band + bandno;
         J2kPrec *prec = band->prec + precno;
         int yi, xi, pos;
-        int cblknw = prec->xi1 - prec->xi0,
-            cblknh = prec->yi1 - prec->yi0;
+        int cblknw = prec->xi1 - prec->xi0;
 
         for (pos=0, yi = prec->yi0; yi < prec->yi1; yi++){
             for (xi = prec->xi0; xi < prec->xi1; xi++, pos++){