[FFmpeg-cvslog] arm: Only build the FFT init files if FFT is enabled

Martin Storsjö git at videolan.org
Thu May 30 11:02:08 CEST 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed May 29 21:08:10 2013 +0300| [36a7df8cf1115aa37a1b0d42324ecde5ab6c2304] | committer: Martin Storsjö

arm: Only build the FFT init files if FFT is enabled

This fixes build errors in cases where FFT is disabled.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavcodec/arm/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 940f808..f4beb2d 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -2,8 +2,6 @@ ARCH_HEADERS = mathops.h
 
 OBJS                                   += arm/dsputil_init_arm.o        \
                                           arm/dsputil_arm.o             \
-                                          arm/fft_init_arm.o            \
-                                          arm/fft_fixed_init_arm.o      \
                                           arm/fmtconvert_init_arm.o     \
                                           arm/jrevdct_arm.o             \
                                           arm/simple_idct_arm.o         \
@@ -13,6 +11,8 @@ OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
 OBJS-$(CONFIG_AC3DSP)                  += arm/ac3dsp_init_arm.o         \
                                           arm/ac3dsp_arm.o
 OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
+OBJS-$(CONFIG_FFT)                     += arm/fft_init_arm.o            \
+                                          arm/fft_fixed_init_arm.o
 OBJS-$(CONFIG_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
                                           arm/flacdsp_arm.o
 OBJS-$(CONFIG_H264CHROMA)              += arm/h264chroma_init_arm.o



More information about the ffmpeg-cvslog mailing list