diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:37:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:51:20 +0200 |
| commit | cc3e7a4c3df9f6de6f4a2f312355dc221d6380f0 (patch) | |
| tree | b1da90fbc7cb5013fabacba7364f99e5e9403d0c /libavcodec/x86/Makefile | |
| parent | 98227ba5fa456b5dacd404e125420c9abf87ff95 (diff) | |
| parent | acf91215c74a91eb3b86af01dcb1d3c78d0e2310 (diff) | |
Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'
* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 44ccb2040f..546513bfa9 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,8 +6,7 @@ OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_init.o OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp_init.o OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp_init.o OBJS-$(CONFIG_DCT) += x86/dct_init.o -OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o -OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ +OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o \ x86/motion_est.o OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o @@ -82,7 +81,7 @@ YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ x86/dwt_yasm.o YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o -YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o +YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o |