diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 17:29:55 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 17:29:55 +0100 |
| commit | cf36180143b3f093f89193b8ca0dd265ed809680 (patch) | |
| tree | 78da1a7f4cbb08ff85a64f16f2be5029e8fc996d | |
| parent | 1e860f16688bf0c2a875f8ad4a912c84c013c12f (diff) | |
| download | ffmpeg-cf36180143b3f093f89193b8ca0dd265ed809680.tar.gz | |
Only set accelerated arm fft functions if fft is enabled.
Fixes lavc compilation (linking) for configurations without fft.
Reported-by: tyler wear
Tested-by: Gavin Kinsey
| -rw-r--r-- | libavcodec/arm/fft_fixed_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/fft_init_arm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/fft_fixed_init_arm.c b/libavcodec/arm/fft_fixed_init_arm.c index 59b933e5a0..ef098f4bf1 100644 --- a/libavcodec/arm/fft_fixed_init_arm.c +++ b/libavcodec/arm/fft_fixed_init_arm.c @@ -33,7 +33,9 @@ av_cold void ff_fft_fixed_init_arm(FFTContext *s) if (have_neon(cpu_flags)) { s->fft_permutation = FF_FFT_PERM_SWAP_LSBS; +#if CONFIG_FFT s->fft_calc = ff_fft_fixed_calc_neon; +#endif #if CONFIG_MDCT if (!s->inverse && s->nbits >= 3) { diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c index 12d28a3efd..8c98abcdf0 100644 --- a/libavcodec/arm/fft_init_arm.c +++ b/libavcodec/arm/fft_init_arm.c @@ -43,8 +43,10 @@ av_cold void ff_fft_init_arm(FFTContext *s) int cpu_flags = av_get_cpu_flags(); if (have_neon(cpu_flags)) { +#if CONFIG_FFT s->fft_permute = ff_fft_permute_neon; s->fft_calc = ff_fft_calc_neon; +#endif #if CONFIG_MDCT s->imdct_calc = ff_imdct_calc_neon; s->imdct_half = ff_imdct_half_neon; |