[FFmpeg-cvslog] ARM: fix build with FFT enabled and MDCT disabled

Felipe Contreras git at videolan.org
Sat Jan 21 01:49:42 CET 2012


ffmpeg | branch: master | Felipe Contreras <felipe.contreras at gmail.com> | Fri Jan 20 16:01:07 2012 +0000| [c3d5e290ca868f72c53740fdc66133a474c12c7e] | committer: Mans Rullgard

ARM: fix build with FFT enabled and MDCT disabled

Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>
Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3d5e290ca868f72c53740fdc66133a474c12c7e
---

 libavcodec/arm/fft_init_arm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c
index 4ee4909..b2c3b72 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
     }
 }
 



More information about the ffmpeg-cvslog mailing list