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/j2kenc.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/j2kenc.c')
-rw-r--r-- | libavcodec/j2kenc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index d673daf1c9..aea12f3218 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -366,7 +366,14 @@ static int init_tiles(Jpeg2000EncoderContext *s) for (j = 0; j < 2; j++) comp->coord[i][j] = ff_jpeg2000_ceildivpow2(comp->coord[i][j], s->chroma_shift[i]); - if (ret = ff_j2k_init_component(comp, codsty, qntsty, s->cbps[compno], compno?1<<s->chroma_shift[0]:1, compno?1<<s->chroma_shift[1]:1)) + if (ret = ff_j2k_init_component(comp, + codsty, + qntsty, + s->cbps[compno], + compno?1<<s->chroma_shift[0]:1, + compno?1<<s->chroma_shift[1]:1, + s->avctx + )) return ret; } } |