diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 10:01:10 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-02 20:05:44 +0200 |
| commit | 86a2602e16171ddc10c3ec655c23b16ffa595059 (patch) | |
| tree | f805a2967e16cfa4425bdd781f0f1316e7da0333 | |
| parent | ac921338a4986d8cceece8e052dd4af60576d542 (diff) | |
| download | ffmpeg-86a2602e16171ddc10c3ec655c23b16ffa595059.tar.gz | |
jpeg2000: Drop unused and writeonly fields
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/jpeg2000.h | 4 | ||||
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 9282dd50a5..00bfcdda81 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -136,8 +136,6 @@ typedef struct Jpeg2000CodingStyle { log2_cblk_height; // exponent of codeblock size uint8_t transform; // DWT type uint8_t csty; // coding style - uint8_t log2_prec_width, - log2_prec_height; // precinct size uint8_t nlayers; // number of layers uint8_t mct; // multiple component transformation uint8_t cblk_style; // codeblock coding style @@ -172,7 +170,6 @@ typedef struct Jpeg2000Cblk { } Jpeg2000Cblk; // code block typedef struct Jpeg2000Prec { - uint16_t xi0, yi0; // codeblock indexes ([xi0, xi1)) uint16_t nb_codeblocks_width; uint16_t nb_codeblocks_height; Jpeg2000TgtNode *zerobits; @@ -186,7 +183,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 diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8df6ee2df4..af464be65c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -318,6 +318,9 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy } + } else { + memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths )); + memset(c->log2_prec_heights, 15, sizeof(c->log2_prec_heights)); } return 0; } @@ -332,9 +335,6 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, if (bytestream2_get_bytes_left(&s->g) < 5) return AVERROR_INVALIDDATA; - tmp.log2_prec_width = - tmp.log2_prec_height = 15; - tmp.csty = bytestream2_get_byteu(&s->g); // get progression order @@ -650,8 +650,6 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, if (band->coord[0][0] == band->coord[0][1] || band->coord[1][0] == band->coord[1][1]) continue; - prec->yi0 = 0; - prec->xi0 = 0; nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width; for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { |