aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2012-01-20 16:01:07 +0000
committerMans Rullgard <mans@mansr.com>2012-01-20 16:14:01 +0000
commitc3d5e290ca868f72c53740fdc66133a474c12c7e (patch)
tree560119c175dd699d39595b08fdd48cd4b0bd6136 /libavcodec/arm
parent59297ad63dbd7f9a587e742e1d5b0e94ae125fff (diff)
downloadffmpeg-c3d5e290ca868f72c53740fdc66133a474c12c7e.tar.gz
ARM: fix build with FFT enabled and MDCT disabled
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm')
-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 4ee4909682..b2c3b721fd 100644
--- a/libavcodec/arm/fft_init_arm.c
+++ b/libavcodec/arm/fft_init_arm.c
@@ -42,10 +42,12 @@ av_cold void ff_fft_init_arm(FFTContext *s)
if (HAVE_NEON) {
s->fft_permute = ff_fft_permute_neon;
s->fft_calc = ff_fft_calc_neon;
+#if CONFIG_MDCT
s->imdct_calc = ff_imdct_calc_neon;
s->imdct_half = ff_imdct_half_neon;
s->mdct_calc = ff_mdct_calc_neon;
s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
+#endif
}
}