Skip to content
Snippets Groups Projects
Commit 3300b5f6 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

j2k/jpeg2000 headers: Cblk/Prec cleanup & merge 


Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent a1873f35
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libavcodec/j2k.h
+ 3
− 0
View file @ 3300b5f6
...@@ -167,8 +167,11 @@ typedef struct Jpeg2000Cblk { ...@@ -167,8 +167,11 @@ typedef struct Jpeg2000Cblk {
typedef struct Jpeg2000Prec { typedef struct Jpeg2000Prec {
uint16_t xi0, xi1, yi0, yi1; // codeblock indexes ([xi0, xi1)) uint16_t xi0, xi1, yi0, yi1; // codeblock indexes ([xi0, xi1))
uint16_t nb_codeblocks_width;
uint16_t nb_codeblocks_height;
Jpeg2000TgtNode *zerobits; Jpeg2000TgtNode *zerobits;
Jpeg2000TgtNode *cblkincl; Jpeg2000TgtNode *cblkincl;
Jpeg2000Cblk *cblk;
} Jpeg2000Prec; // precinct } Jpeg2000Prec; // precinct
typedef struct Jpeg2000Band { typedef struct Jpeg2000Band {
......
libavcodec/jpeg2000.h
+ 0
− 1
View file @ 3300b5f6
...@@ -182,7 +182,6 @@ typedef struct Jpeg2000Prec { ...@@ -182,7 +182,6 @@ typedef struct Jpeg2000Prec {
typedef struct Jpeg2000Band { typedef struct Jpeg2000Band {
uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
uint16_t log2_cblk_width, log2_cblk_height; uint16_t log2_cblk_width, log2_cblk_height;
uint16_t cblknx, cblkny;
float stepsize; // quantization stepsize float stepsize; // quantization stepsize
Jpeg2000Prec *prec; Jpeg2000Prec *prec;
} Jpeg2000Band; // subband } Jpeg2000Band; // subband
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment