diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2010-07-22 00:39:49 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2010-07-22 00:39:49 +0000 |
| commit | c7b1d9768c20ba5848f503f5258b4429fd303f3d (patch) | |
| tree | cc4f173336b323cb4064b878c4736043b95d7aba /libavcodec/x86/Makefile | |
| parent | a33e036577ded2b41cb33baca2e653666d77fbdf (diff) | |
| download | ffmpeg-c7b1d9768c20ba5848f503f5258b4429fd303f3d.tar.gz | |
relicense h264 deblock sse2 to lgpl
Originally committed as revision 24408 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 6d1a9c6064..3f19f06b88 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,10 +6,10 @@ 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_deblock_sse2.o \ - x86/h264_idct_sse2.o \ +YASM-OBJS-$(CONFIG_GPL) += x86/h264_idct_sse2.o \ -YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_intrapred.o \ +YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock_sse2.o \ + x86/h264_intrapred.o \ YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o |