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/j2kenc.c | |
| parent | 160ea26560c4e929b6b70937f032234c33fbe6c7 (diff) | |
j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kenc.c')
| -rw-r--r-- | libavcodec/j2kenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index bd90d4e55d..528b9a7f16 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -819,7 +819,7 @@ static int encode_tile(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile, int tileno Jpeg2000Component *comp = s->tile[tileno].comp + compno; av_log(s->avctx, AV_LOG_DEBUG,"dwt\n"); - if (ret = ff_j2k_dwt_encode(&comp->dwt, comp->data)) + if (ret = ff_dwt_encode(&comp->dwt, comp->data)) return ret; av_log(s->avctx, AV_LOG_DEBUG,"after dwt -> tier1\n"); |