diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:43:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:43:50 +0200 |
| commit | cff61d595e453c15e37f4fdfdb3dba93d19f5fa9 (patch) | |
| tree | 9a792539950a03ba6f33a2b48989338257e7786e /libavcodec | |
| parent | 29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b (diff) | |
| parent | 24af1aa0f70362a66cda04c9d7cd012e019f5572 (diff) | |
| download | ffmpeg-cff61d595e453c15e37f4fdfdb3dba93d19f5fa9.tar.gz | |
Merge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'
* commit '24af1aa0f70362a66cda04c9d7cd012e019f5572':
fft: Convert FFT/MDCT permutation type #defines to enums
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/fft.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h index 2d7e254985..64f0f6331e 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -74,6 +74,17 @@ typedef struct FFTDComplex { /* FFT computation */ +enum fft_permutation_type { + FF_FFT_PERM_DEFAULT, + FF_FFT_PERM_SWAP_LSBS, + FF_FFT_PERM_AVX, +}; + +enum mdct_permutation_type { + FF_MDCT_PERM_NONE, + FF_MDCT_PERM_INTERLEAVE, +}; + struct FFTContext { int nbits; int inverse; @@ -97,13 +108,8 @@ struct FFTContext { void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input); - int fft_permutation; -#define FF_FFT_PERM_DEFAULT 0 -#define FF_FFT_PERM_SWAP_LSBS 1 -#define FF_FFT_PERM_AVX 2 - int mdct_permutation; -#define FF_MDCT_PERM_NONE 0 -#define FF_MDCT_PERM_INTERLEAVE 1 + enum fft_permutation_type fft_permutation; + enum mdct_permutation_type mdct_permutation; }; #if CONFIG_HARDCODED_TABLES |