diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:45:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:45:34 +0200 |
| commit | 115a9b5091cd1be8d370f2d7ec1821df595decc7 (patch) | |
| tree | 09f7bc3e24dd76c88fa563a60b11a898b1a96094 /libavcodec/x86 | |
| parent | 3500eccb8e7fce470a8cf746fdd4bc1ee0798215 (diff) | |
| parent | d42191c78befc1983f23b1899b2dda513b72f1ed (diff) | |
| download | ffmpeg-115a9b5091cd1be8d370f2d7ec1821df595decc7.tar.gz | |
Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
configure: Factor out vp8dsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index ee02135384..a515ebd0ba 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -34,6 +34,7 @@ OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp_init.o OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp_init.o OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o +OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o # decoders/encoders @@ -60,8 +61,6 @@ OBJS-$(CONFIG_V210_ENCODER) += x86/v210enc_init.o OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_init.o OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp_init.o OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp_init.o -OBJS-$(CONFIG_VP7_DECODER) += x86/vp8dsp_init.o -OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o @@ -127,6 +126,8 @@ YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ YASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o +YASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \ + x86/vp8dsp_loopfilter.o # decoders/encoders YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o @@ -154,10 +155,6 @@ YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o -YASM-OBJS-$(CONFIG_VP7_DECODER) += x86/vp8dsp.o \ - x86/vp8dsp_loopfilter.o -YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o \ - x86/vp8dsp_loopfilter.o YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \ x86/vp9itxfm.o \ x86/vp9lpf.o \ |