Browse Source

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>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
69f7ccef8e
2 changed files with 2 additions and 2 deletions
  1. +0
    -2
      libavcodec/jpeg2000dwt.c
  2. +2
    -0
      libavcodec/jpeg2000dwt.h

+ 0
- 2
libavcodec/jpeg2000dwt.c View File

@@ -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) */


+ 2
- 0
libavcodec/jpeg2000dwt.h View File

@@ -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,


Loading…
Cancel
Save