diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
| commit | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (patch) | |
| tree | d3d9c3e9aa718b0621f13644d0867490d4aee992 /libavcodec/fft.h | |
| parent | 148f69eb4e4ce63b911a53bcb883b77b364f13bd (diff) | |
| parent | 42b9150b0d4f0a130c1d93dc991fd5412743a8cf (diff) | |
Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'
* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.h')
| -rw-r--r-- | libavcodec/fft.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h index 9d92b2c2d2..fc17d66ac0 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -133,14 +133,12 @@ void ff_init_ff_cos_tabs(int index); */ int ff_fft_init(FFTContext *s, int nbits, int inverse); -#if CONFIG_FFT_FLOAT void ff_fft_init_altivec(FFTContext *s); void ff_fft_init_x86(FFTContext *s); void ff_fft_init_arm(FFTContext *s); void ff_fft_init_mips(FFTContext *s); -#else + void ff_fft_fixed_init_arm(FFTContext *s); -#endif void ff_fft_end(FFTContext *s); |