summaryrefslogtreecommitdiff
path: root/libavcodec/x86
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/x86
parentd74a8cb7e42f703be5796eeb485f06af710ae8ca (diff)
lavc: do not compile fmtconvert unconditionally
Only ac3dec and dcadec use it.
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 7caa256c43..09bb6a2fe1 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -1,5 +1,4 @@
OBJS += x86/constants.o \
- x86/fmtconvert_init.o \
# subsystems
OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
@@ -9,6 +8,7 @@ OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp_init.o
OBJS-$(CONFIG_DCT) += x86/dct_init.o
OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o
OBJS-$(CONFIG_FFT) += x86/fft_init.o
+OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert_init.o
OBJS-$(CONFIG_H263DSP) += x86/h263dsp_init.o
OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o
OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
@@ -74,7 +74,6 @@ MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
# YASM optimizations
YASM-OBJS += x86/deinterlace.o \
- x86/fmtconvert.o \
# subsystems
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
@@ -83,6 +82,7 @@ YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o
YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
YASM-OBJS-$(CONFIG_FFT) += x86/fft.o
+YASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o
YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o
YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
x86/h264_chromamc_10bit.o