diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 15:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 15:55:29 +0200 |
| commit | c2e942099ac8ec989ec49ca9f466909726548091 (patch) | |
| tree | 44a70976e5799a48899d8e996cc52df5bb8fe849 /libavcodec/j2k.c | |
| parent | 8c2e201c4f3a35dc4b1ec7dadc9d237f19397c1e (diff) | |
| download | ffmpeg-c2e942099ac8ec989ec49ca9f466909726548091.tar.gz | |
j2k: drop cblknx/y from Jpeg2000Band
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
| -rw-r--r-- | libavcodec/j2k.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index 9ef40e7ca6..443259b40d 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -291,17 +291,12 @@ int ff_j2k_init_component(Jpeg2000Component *comp, log2_band_prec_width = reslevel->log2_prec_width - 1; log2_band_prec_height = reslevel->log2_prec_height - 1; } - band->cblknx = ff_jpeg2000_ceildivpow2(band->coord[0][1], band->log2_cblk_width) - (band->coord[0][0] >> band->log2_cblk_width); - band->cblkny = ff_jpeg2000_ceildivpow2(band->coord[1][1], band->log2_cblk_height) - (band->coord[1][0] >> band->log2_cblk_height); for (j = 0; j < 2; j++) band->coord[0][j] = ff_jpeg2000_ceildiv(band->coord[0][j], dx); for (j = 0; j < 2; j++) band->coord[1][j] = ff_jpeg2000_ceildiv(band->coord[1][j], dy); - band->cblknx = ff_jpeg2000_ceildiv(band->cblknx, dx); - band->cblkny = ff_jpeg2000_ceildiv(band->cblkny, dy); - band->prec = av_malloc_array(reslevel->num_precincts_x * reslevel->num_precincts_y, sizeof(*band->prec)); |