diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 17:46:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 17:50:54 +0200 |
| commit | 1b5cb6c00a170ebd850dc14cf23b33b5644f7909 (patch) | |
| tree | 1a17ba2e867a89c7eebfdb9f6b2b75c98ffe9a89 /libavcodec/j2kdec.c | |
| parent | 9a18395b92f021938e1db29100f6c8ca690d3ab7 (diff) | |
| download | ffmpeg-1b5cb6c00a170ebd850dc14cf23b33b5644f7909.tar.gz | |
j2k/jpeg2000: Partially merge quantization code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kdec.c')
| -rw-r--r-- | libavcodec/j2kdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 1881ba062c..b349c97111 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -439,7 +439,7 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) comp->coord[1][0] = FFMAX(tiley * s->tile_height + s->tile_offset_y, s->image_offset_y); comp->coord[1][1] = FFMIN((tiley+1)*s->tile_height + s->tile_offset_y, s->height); - if (ret = ff_j2k_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno])) + if (ret = ff_j2k_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno], s->avctx)) return ret; } return 0; |