summaryrefslogtreecommitdiff
path: root/libavcodec/x86/Makefile
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-06-25 19:06:29 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-06-25 19:06:29 +0000
commit0c59074868988ec402aba0bdc9d01c8841eb0ddd (patch)
tree6a68f922ed9e767cc67c9ee13f20ed554a93cca5 /libavcodec/x86/Makefile
parent15d31aa1e129bb301cc4f72e44a21a583ea75f09 (diff)
Fix compilation without --enable-gpl.
Originally committed as revision 23789 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r--libavcodec/x86/Makefile5
1 files changed, 4 insertions, 1 deletions
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