diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 3a0922337e..7f6f7f45b1 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -8,7 +8,10 @@ YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o                 \
                                           $(YASM-OBJS-FFT-yes)
 YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
                                           x86/h264_idct_sse2.o          \
-                                          x86/h264_intrapred.o          \
+
+YASM-OBJS-$(CONFIG_H264_DECODER)       += x86/h264_intrapred.o          \
+
+YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/h264_intrapred.o          \
 
 MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
 MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o