diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 01:54:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 01:54:51 +0200 |
| commit | 69f7ccef8e12a9995ae08c9cca429bd4402bed69 (patch) | |
| tree | 066abdf0d116fc2d20beef5e2090378faa702499 /libavcodec | |
| parent | 1c495b0bf690995c45f79f4f19500921e14ec78a (diff) | |
| download | ffmpeg-69f7ccef8e12a9995ae08c9cca429bd4402bed69.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dwt.c | 2 | ||||
| -rw-r--r-- | libavcodec/jpeg2000dwt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index 9c887d2afd..b997e7e180 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 b6d296d8a8..57297d4127 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, |