aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-02-21 11:24:44 +0100
committerAnton Khirnov <anton@khirnov.net>2015-02-28 21:51:24 +0100
commit71f1ad37d858b810b71a4af1c25771beaa50b27b (patch)
treedda140fcb74ce63829cec1156b33ac9c5020d939 /libavcodec/arm
parentd74a8cb7e42f703be5796eeb485f06af710ae8ca (diff)
downloadffmpeg-71f1ad37d858b810b71a4af1c25771beaa50b27b.tar.gz
lavc: do not compile fmtconvert unconditionally
Only ac3dec and dcadec use it.
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 8fba0c6511..57f5bc4d6f 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -1,7 +1,5 @@
ARCH_HEADERS = mathops.h
-OBJS += arm/fmtconvert_init_arm.o
-
# subsystems
OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
arm/ac3dsp_arm.o
@@ -9,6 +7,7 @@ OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o
OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_arm.o
OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \
arm/fft_fixed_init_arm.o
+OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_init_arm.o
OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o
OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
@@ -86,10 +85,10 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
# VFP optimizations
-VFP-OBJS += arm/fmtconvert_vfp.o
# subsystems
VFP-OBJS-$(CONFIG_FFT) += arm/fft_vfp.o
+VFP-OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_vfp.o
VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o
# decoders/encoders
@@ -98,7 +97,6 @@ VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \
# NEON optimizations
-NEON-OBJS += arm/fmtconvert_neon.o
# subsystems
NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
@@ -109,6 +107,7 @@ NEON-OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_neon.o \
arm/blockdsp_neon.o
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
arm/fft_fixed_neon.o
+NEON-OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_neon.o
NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o
NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
arm/h264idct_neon.o