[FFmpeg-cvslog] j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 26 23:55:18 2013 +0200| [3300b5f6ce84ae3e9d7a3a4b9016364e763c3d9c] | committer: Michael Niedermayer

j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3300b5f6ce84ae3e9d7a3a4b9016364e763c3d9c
---

 libavcodec/j2k.h      |    3 +++
 libavcodec/jpeg2000.h |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h
index 5c6b1d3..bef07ab 100644
--- 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 e15fa78..2054aa3 100644
--- 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