diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 10:01:26 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-02 20:05:46 +0200 |
| commit | 5b73916d34527ce9a615f7934e02558ad1d77713 (patch) | |
| tree | 33ee6882d09d0cb2816ad81d381763a3d853e4ff | |
| parent | 33e665a6abf1bfe45bc2d9484f1dd2dcdfb2324a (diff) | |
| download | ffmpeg-5b73916d34527ce9a615f7934e02558ad1d77713.tar.gz | |
jpeg2000: Simplify init_tile()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 802180f65b..0fa8ccaa16 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -573,8 +573,6 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) int tilex = tileno % s->numXtiles; int tiley = tileno / s->numXtiles; Jpeg2000Tile *tile = s->tile + tileno; - Jpeg2000CodingStyle *codsty; - Jpeg2000QuantStyle *qntsty; if (!tile->comp) return AVERROR(ENOMEM); @@ -582,14 +580,14 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) /* copy codsty, qnsty to tile. TODO: Is it the best way? * codsty, qnsty is an array of 4 structs Jpeg2000CodingStyle * and Jpeg2000QuantStyle */ - memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(*codsty)); - memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(*qntsty)); + memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(*tile->codsty)); + memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(*tile->qntsty)); for (compno = 0; compno < s->ncomponents; compno++) { Jpeg2000Component *comp = tile->comp + compno; + Jpeg2000CodingStyle *codsty = tile->codsty + compno; + Jpeg2000QuantStyle *qntsty = tile->qntsty + compno; int ret; // global bandno - codsty = tile->codsty + compno; - qntsty = tile->qntsty + compno; comp->coord_o[0][0] = FFMAX(tilex * s->tile_width + s->tile_offset_x, s->image_offset_x); comp->coord_o[0][1] = FFMIN((tilex + 1) * s->tile_width + s->tile_offset_x, s->width); |