diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:57:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:57:14 +0200 |
| commit | 0b539da4c74b412af21099a608abad2707e9e27b (patch) | |
| tree | 3db5ed326bf13002f393b6862d39a388afd62117 | |
| parent | 3a0e21f037c082e431eff62c47203cf4d77c88cb (diff) | |
| parent | 36a7df8cf1115aa37a1b0d42324ecde5ab6c2304 (diff) | |
| download | ffmpeg-0b539da4c74b412af21099a608abad2707e9e27b.tar.gz | |
Merge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304'
* commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304':
arm: Only build the FFT init files if FFT is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 940f808c2f..f4beb2da3a 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 |