diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:04:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:10:56 +0100 |
| commit | 7778979f6f9c863430bbf8335e7a67e875a30513 (patch) | |
| tree | 7fa1b50af5095e117b7c60644281522bd0379650 /libavcodec/fft.h | |
| parent | 2503928a2f8ba80f3988344faf430d4ad54fbf27 (diff) | |
| parent | 794fcf79a89eca2d4e889803b2c804a0b1defbb3 (diff) | |
Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'
* commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3':
Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT
Conflicts:
libavcodec/fft-internal.h
libavcodec/fft-test.c
libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/fft_template.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.h')
| -rw-r--r-- | libavcodec/fft.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h index 217090cf2a..87fe704131 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -22,8 +22,8 @@ #ifndef AVCODEC_FFT_H #define AVCODEC_FFT_H -#ifndef CONFIG_FFT_FLOAT -#define CONFIG_FFT_FLOAT 1 +#ifndef FFT_FLOAT +#define FFT_FLOAT 1 #endif #ifndef CONFIG_FFT_FIXED_32 @@ -34,7 +34,7 @@ #include "config.h" #include "libavutil/mem.h" -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT #include "avfft.h" @@ -66,7 +66,7 @@ typedef struct FFTComplex { typedef int FFTDouble; typedef struct FFTContext FFTContext; -#endif /* CONFIG_FFT_FLOAT */ +#endif /* FFT_FLOAT */ typedef struct FFTDComplex { FFTDouble re, im; |