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/j2kdec.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/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 7bf0e9e6de..28c5f1c6d4 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -841,7 +841,7 @@ static int decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) } /* end band */ } /* end reslevel */ - ff_j2k_dwt_decode(&comp->dwt, comp->data); + ff_dwt_decode(&comp->dwt, comp->data); src[compno] = comp->data; } /*end comp */ |