RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-10 00:59:38 +00:00
Code Issues Projects Releases Wiki Activity

j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-26 23:55:18 +02:00
parent a1873f35f8
commit 3300b5f6ce
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/j2k.h
View File

@ -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 {

1
libavcodec/jpeg2000.h
View File

@ -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