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-test.c | |
| parent | 2503928a2f8ba80f3988344faf430d4ad54fbf27 (diff) | |
| parent | 794fcf79a89eca2d4e889803b2c804a0b1defbb3 (diff) | |
| download | ffmpeg-7778979f6f9c863430bbf8335e7a67e875a30513.tar.gz | |
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-test.c')
| -rw-r--r-- | libavcodec/fft-test.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index d650a10844..5819cc0dee 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -29,7 +29,7 @@ #include "libavutil/log.h" #include "libavutil/time.h" #include "fft.h" -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT #include "dct.h" #include "rdft.h" #endif @@ -51,7 +51,7 @@ pim += (MUL16(are, bim) + MUL16(bre, aim));\ } -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT # define RANGE 1.0 # define REF_SCALE(x, bits) (x) # define FMT "%10.6f" @@ -152,7 +152,7 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits) } } -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT static void idct_ref(FFTSample *output, FFTSample *input, int nbits) { int n = 1<<nbits; @@ -252,7 +252,7 @@ int main(int argc, char **argv) int do_inverse = 0; FFTContext s1, *s = &s1; FFTContext m1, *m = &m1; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT RDFTContext r1, *r = &r1; DCTContext d1, *d = &d1; int fft_size_2; @@ -326,7 +326,7 @@ int main(int argc, char **argv) ff_fft_init(s, fft_nbits, do_inverse); fft_ref_init(fft_nbits, do_inverse); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: if (do_inverse) av_log(NULL, AV_LOG_INFO,"IDFT_C2R"); @@ -383,7 +383,7 @@ int main(int argc, char **argv) fft_ref(tab_ref, tab1, fft_nbits); err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: fft_size_2 = fft_size >> 1; if (do_inverse) { @@ -452,7 +452,7 @@ int main(int argc, char **argv) memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); s->fft_calc(s, tab); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: memcpy(tab2, tab1, fft_size * sizeof(FFTSample)); r->rdft_calc(r, tab2); @@ -482,7 +482,7 @@ int main(int argc, char **argv) case TRANSFORM_FFT: ff_fft_end(s); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: ff_rdft_end(r); break; |