[FFmpeg-cvslog] avcodec/jpeg2000dwt: Move K/X constants to header
Michael Niedermayer
git at videolan.org
Mon Jun 22 02:15:30 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 22 01:54:51 2015 +0200| [69f7ccef8e12a9995ae08c9cca429bd4402bed69] | committer: Michael Niedermayer
avcodec/jpeg2000dwt: Move K/X constants to header
this makes them accessible by the rest of the jpeg2000 code
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69f7ccef8e12a9995ae08c9cca429bd4402bed69
---
libavcodec/jpeg2000dwt.c | 2 --
libavcodec/jpeg2000dwt.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index 9c887d2..b997e7e 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -37,8 +37,6 @@
#define F_LFTG_BETA 0.052980118572961f
#define F_LFTG_GAMMA 0.882911075530934f
#define F_LFTG_DELTA 0.443506852043971f
-#define F_LFTG_K 1.230174104914001f
-#define F_LFTG_X 0.812893066115961f
/* Lifting parameters in integer format.
* Computed as param = (float param) * (1 << 16) */
diff --git a/libavcodec/jpeg2000dwt.h b/libavcodec/jpeg2000dwt.h
index b6d296d..57297d4 100644
--- a/libavcodec/jpeg2000dwt.h
+++ b/libavcodec/jpeg2000dwt.h
@@ -30,6 +30,8 @@
#include <stdint.h>
#define FF_DWT_MAX_DECLVLS 32 ///< max number of decomposition levels
+#define F_LFTG_K 1.230174104914001f
+#define F_LFTG_X 0.812893066115961f
enum DWTType {
FF_DWT97,
More information about the ffmpeg-cvslog
mailing list