summaryrefslogtreecommitdiff
path: root/libavcodec/arm/fft_init_arm.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-17 17:29:55 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-17 17:29:55 +0100
commitcf36180143b3f093f89193b8ca0dd265ed809680 (patch)
tree78da1a7f4cbb08ff85a64f16f2be5029e8fc996d /libavcodec/arm/fft_init_arm.c
parent1e860f16688bf0c2a875f8ad4a912c84c013c12f (diff)
downloadffmpeg-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
Diffstat (limited to 'libavcodec/arm/fft_init_arm.c')
-rw-r--r--libavcodec/arm/fft_init_arm.c2
1 files changed, 2 insertions, 0 deletions
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;