diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-12 07:28:11 -0700 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-04-10 11:04:05 +0300 |
commit | b93b27edb0455287f49182fbf11b68e575f59225 (patch) | |
tree | 2b28d3f9edeb10c7de0e0dc33bc780182306a945 /libavcodec/x86/Makefile | |
parent | 85deb51a01f1ecc5ac5faa52ad8ea141c384e23a (diff) | |
download | ffmpeg-b93b27edb0455287f49182fbf11b68e575f59225.tar.gz |
dsputil: Make dsputil selectable
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r-- | libavcodec/x86/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index cc60f2f0b3..61672b8041 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -1,4 +1,5 @@ -OBJS += x86/fmtconvert_init.o +OBJS += x86/constants.o \ + x86/fmtconvert_init.o \ OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o @@ -29,7 +30,7 @@ OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o -MMX-OBJS += x86/dsputil_mmx.o \ +MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_mmx.o \ x86/fdct.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ @@ -42,6 +43,10 @@ MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o +YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ + x86/hpeldsp.o \ + x86/mpeg4qpel.o \ + x86/qpel.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H263_DECODER) += x86/h263_loopfilter.o @@ -57,7 +62,8 @@ YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \ YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \ x86/h264_intrapred_10bit.o YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_8bit.o \ - x86/h264_qpel_10bit.o + x86/h264_qpel_10bit.o \ + x86/qpel.o YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o @@ -71,9 +77,5 @@ YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o -YASM-OBJS += x86/dsputil.o \ - x86/deinterlace.o \ +YASM-OBJS += x86/deinterlace.o \ x86/fmtconvert.o \ - x86/hpeldsp.o \ - x86/mpeg4qpel.o \ - x86/qpel.o \ |