j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 3300b5f6ce
parent a1873f35f8
commit 3300b5f6ce
2 changed files with 3 additions and 1 deletions
--- 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 {
--- 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