diff options
author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-10 02:25:12 +0000 |
---|---|---|
committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-10 02:25:12 +0000 |
commit | 8acb554aff34375358204b928a5a28498b135726 (patch) | |
tree | e310bf45f11c023a8eea3067522dd5eb1b75a692 /libavcodec/x86/Makefile | |
parent | 20de72a447bffa70e6ef345fea441c4cd229312c (diff) | |
download | ffmpeg-8acb554aff34375358204b928a5a28498b135726.tar.gz |
LGPL SSE2 H.264 iDCT
This leaves no more GPL-only H.264 decoding asm code.
Approved by Loren.
Originally committed as revision 25092 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r-- | libavcodec/x86/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 0974f7051e..528d4f9682 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,11 +6,11 @@ YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \ $(YASM-OBJS-FFT-yes) -YASM-OBJS-$(CONFIG_GPL) += x86/h264_idct_sse2.o \ MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \ x86/h264_weight.o \ + x86/h264_idct_sse2.o \ YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o |