diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 23:55:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 15:13:18 +0200 |
| commit | 3300b5f6ce84ae3e9d7a3a4b9016364e763c3d9c (patch) | |
| tree | 4f9bdf5fe0d67d61d4b2a43508ff304f76bf0c0d | |
| parent | a1873f35f83d6a22135d28f2adfd4ced5ae03b08 (diff) | |
| download | ffmpeg-3300b5f6ce84ae3e9d7a3a4b9016364e763c3d9c.tar.gz | |
j2k/jpeg2000 headers: Cblk/Prec cleanup & merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/j2k.h | 3 | ||||
| -rw-r--r-- | libavcodec/jpeg2000.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h index 5c6b1d353a..bef07abc28 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 e15fa788ef..2054aa30a9 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 |