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.h | |
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.h')
-rw-r--r-- | libavcodec/j2k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h index 788f2fcf34..d5742e19e0 100644 --- a/libavcodec/j2k.h +++ b/libavcodec/j2k.h @@ -33,7 +33,7 @@ #include "avcodec.h" #include "mqc.h" -#include "j2k_dwt.h" +#include "jpeg2000dwt.h" enum Jpeg2000Markers { JPEG2000_SOC = 0xff4f, // start of codestream |