diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:45:34 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:45:34 +0300 |
| commit | 115a9b5091cd1be8d370f2d7ec1821df595decc7 (patch) | |
| tree | 09f7bc3e24dd76c88fa563a60b11a898b1a96094 /libavcodec/Makefile | |
| parent | 3500eccb8e7fce470a8cf746fdd4bc1ee0798215 (diff) | |
| parent | d42191c78befc1983f23b1899b2dda513b72f1ed (diff) | |
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/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fc6e2e9da8..d6a1e04733 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -115,6 +115,7 @@ OBJS-$(CONFIG_TPELDSP) += tpeldsp.o OBJS-$(CONFIG_VIDEODSP) += videodsp.o OBJS-$(CONFIG_VP3DSP) += vp3dsp.o OBJS-$(CONFIG_VP56DSP) += vp56dsp.o +OBJS-$(CONFIG_VP8DSP) += vp8dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o # decoders/encoders @@ -529,8 +530,8 @@ OBJS-$(CONFIG_VP3_DECODER) += vp3.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56rac.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o -OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8dsp.o vp56rac.o -OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o +OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o +OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9dsp.o vp56rac.o vp9dsp_8bpp.o \ vp9dsp_10bpp.o vp9dsp_12bpp.o OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o |