summaryrefslogtreecommitdiff
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-06-25 19:10:08 +0000
committerMåns Rullgård <mans@mansr.com>2010-06-25 19:10:08 +0000
commit0912db020644955399a39bc3b0eb9ebeee96026e (patch)
treeecd5c2616d44c9a8591247d7df59a5fece5af65d /libavcodec/x86
parent0c59074868988ec402aba0bdc9d01c8841eb0ddd (diff)
Make vp8 select h264dsp and use this to pull in mmx intrapred
Originally committed as revision 23790 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 7f6f7f45b1..5e971db540 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -9,9 +9,7 @@ YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \
x86/h264_idct_sse2.o \
-YASM-OBJS-$(CONFIG_H264_DECODER) += x86/h264_intrapred.o \
-
-YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/h264_intrapred.o \
+YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_intrapred.o \
MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER) += x86/mpegaudiodec_mmx.o