j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h
index 5c6b1d353a3c4eac68940485495e1800d7b48b68..bef07abc285557f5a93983fc772a9b7026aa5d9a 100644 (file)
--- a/libavcodec/j2k.h
+++ b/libavcodec/j2k.h
@@ -167,8 +167,11 @@ typedef struct Jpeg2000Cblk {
 
 typedef struct Jpeg2000Prec {
     uint16_t xi0, xi1, yi0, yi1; // codeblock indexes ([xi0, xi1))
+    uint16_t nb_codeblocks_width;
+    uint16_t nb_codeblocks_height;
     Jpeg2000TgtNode *zerobits;
     Jpeg2000TgtNode *cblkincl;
+    Jpeg2000Cblk *cblk;
 } Jpeg2000Prec; // precinct
 
 typedef struct Jpeg2000Band {

diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index e15fa788ef45ca0d1d702ae8cbbf2d3882aaed2d..2054aa30a9982645d75fc8c312fcca026af06c5a 100644 (file)
--- a/libavcodec/jpeg2000.h
+++ b/libavcodec/jpeg2000.h
@@ -182,7 +182,6 @@ typedef struct Jpeg2000Prec {
 typedef struct Jpeg2000Band {
     uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
     uint16_t log2_cblk_width, log2_cblk_height;
-    uint16_t cblknx, cblkny;
     float stepsize; // quantization stepsize
     Jpeg2000Prec *prec;
 } Jpeg2000Band; // subband