diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 21:47:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 21:54:07 +0200 |
| commit | d4a4661342640726d80dff0ac26656aac2a4e306 (patch) | |
| tree | e6ccbc954fc2572c59d3bbab51b0a453f5d01632 /libavcodec/j2k.c | |
| parent | 160ea26560c4e929b6b70937f032234c33fbe6c7 (diff) | |
| download | ffmpeg-d4a4661342640726d80dff0ac26656aac2a4e306.tar.gz | |
j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
| -rw-r--r-- | libavcodec/j2k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index 2eca8455d9..e352c4a02e 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -184,7 +184,7 @@ int ff_j2k_init_component(Jpeg2000Component *comp, uint8_t log2_band_prec_width, log2_band_prec_height; int reslevelno, bandno, gbandno = 0, ret, i, j, csize = 1; - if (ret=ff_j2k_dwt_init(&comp->dwt, comp->coord, codsty->nreslevels-1, codsty->transform)) + if (ret=ff_jpeg2000_dwt_init(&comp->dwt, comp->coord, codsty->nreslevels-1, codsty->transform == FF_DWT53 ? FF_DWT53 : FF_DWT97_INT)) return ret; for (i = 0; i < 2; i++) csize *= comp->coord[i][1] - comp->coord[i][0]; @@ -483,7 +483,7 @@ void ff_j2k_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) av_freep(&reslevel->band); } - ff_j2k_dwt_destroy(&comp->dwt); + ff_dwt_destroy(&comp->dwt); av_freep(&comp->reslevel); av_freep(&comp->data); } |