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

[k.nowosad]

Author: k.nowosad
Date: Tue Aug 21 00:06:30 2007
New Revision: 1106

Log:
merged some variable declarations and initializations; simplified


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

Modified: jpeg2000/j2kdec.c
==============================================================================
--- jpeg2000/j2kdec.c	(original)
+++ jpeg2000/j2kdec.c	Tue Aug 21 00:06:30 2007
@@ -722,8 +722,7 @@ static int decode_packet(J2kDecoderConte
     j2k_flush(s);
     for (bandno = 0; bandno < rlevel->nbands; bandno++){
         J2kBand *band = rlevel->band + bandno;
-        int cblknw, yi;
-        cblknw = band->prec[precno].xi1 - band->prec[precno].xi0;
+        int yi, cblknw = band->prec[precno].xi1 - band->prec[precno].xi0;
         for (yi = band->prec[precno].yi0; yi < band->prec[precno].yi1; yi++){
             int xi;
             for (xi = band->prec[precno].xi0; xi < band->prec[precno].xi1; xi++){

Modified: jpeg2000/j2kenc.c
==============================================================================
--- jpeg2000/j2kenc.c	(original)
+++ jpeg2000/j2kenc.c	Tue Aug 21 00:06:30 2007
@@ -797,20 +797,19 @@ static void encode_packet(J2kEncoderCont
             break;
         }
     }
+
+    put_bits(s, !empty, 1);
     if (empty){
-        put_bits(s, 0, 1);
         j2k_flush(s);
         return;
     }
 
-    put_bits(s, 1, 1);
     for (bandno = 0; bandno < rlevel->nbands; bandno++){
         J2kBand *band = rlevel->band + bandno;
         J2kTgtNode *cblkincl, *zerobits;
-        int cblknw, cblknh, yi, xi, pos;
-
-        cblknh = band->prec[precno].yi1 - band->prec[precno].yi0;
-        cblknw = band->prec[precno].xi1 - band->prec[precno].xi0;
+        int yi, xi, pos;
+        int cblknw = band->prec[precno].xi1 - band->prec[precno].xi0,
+            cblknh = band->prec[precno].yi1 - band->prec[precno].yi0;
 
         cblkincl = ff_j2k_tag_tree_init(cblknw, cblknh);
         zerobits = ff_j2k_tag_tree_init(cblknw, cblknh);
@@ -857,8 +856,7 @@ static void encode_packet(J2kEncoderCont
     j2k_flush(s);
     for (bandno = 0; bandno < rlevel->nbands; bandno++){
         J2kBand *band = rlevel->band + bandno;
-        int cblknw, yi;
-        cblknw = band->prec[precno].xi1 - band->prec[precno].xi0;
+        int yi, cblknw = band->prec[precno].xi1 - band->prec[precno].xi0;
         for (yi = band->prec[precno].yi0; yi < band->prec[precno].yi1; yi++){
             int xi;
             for (xi = band->prec[precno].xi0; xi < band->prec[precno].xi1; xi++){