diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 21:55:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 22:07:52 +0200 |
commit | d6676a16057576e1a0ee66ae89963ec54f632919 (patch) | |
tree | 3a1dd254d3034f02eba26cc4bee75a6f8e723516 /libavcodec/x86/Makefile | |
parent | 8e2976860ffc920e31e0c45bb1361ac3a552cae8 (diff) | |
parent | c23ce454b3e33634a188d6facfd2b7182af5af93 (diff) |
Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'
* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
x86: dsputil: Coalesce all init files
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r-- | libavcodec/x86/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 546513bfa9..a208296e67 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 \ - x86/motion_est.o +OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp_init.o |