Mercurial > libavcodec.hg
changeset 12213:c6509c205922 libavcodec
relicense h264 deblock sse2 to lgpl
| author | lorenm |
|---|---|
| date | Thu, 22 Jul 2010 00:39:49 +0000 |
| parents | bc13f76ecfbf |
| children | 657d353cd515 |
| files | x86/Makefile x86/dsputil_mmx.c x86/h264_deblock_sse2.asm |
| diffstat | 3 files changed, 19 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/x86/Makefile Wed Jul 21 22:45:16 2010 +0000 +++ b/x86/Makefile Thu Jul 22 00:39:49 2010 +0000 @@ -6,10 +6,10 @@ 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
--- a/x86/dsputil_mmx.c Wed Jul 21 22:45:16 2010 +0000 +++ b/x86/dsputil_mmx.c Thu Jul 22 00:39:49 2010 +0000 @@ -2999,7 +2999,7 @@ c->h264_idct8_add4= ff_h264_idct8_add4_sse2; } -#if CONFIG_GPL && HAVE_YASM +#if HAVE_YASM if (mm_flags & FF_MM_MMX2){ #if ARCH_X86_32 c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext; @@ -3012,9 +3012,11 @@ c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_sse2; c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_sse2; #endif +#if CONFIG_GPL c->h264_idct_add16 = ff_h264_idct_add16_sse2; c->h264_idct_add8 = ff_h264_idct_add8_sse2; c->h264_idct_add16intra = ff_h264_idct_add16intra_sse2; +#endif } } #endif
--- a/x86/h264_deblock_sse2.asm Wed Jul 21 22:45:16 2010 +0000 +++ b/x86/h264_deblock_sse2.asm Thu Jul 22 00:39:49 2010 +0000 @@ -5,20 +5,22 @@ ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* -;* This program is free software; you can redistribute it and/or modify -;* it under the terms of the GNU General Public License as published by -;* the Free Software Foundation; either version 2 of the License, or -;* (at your option) any later version. +;* This file is part of FFmpeg. ;* -;* This program is distributed in the hope that it will be useful, +;* FFmpeg is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* FFmpeg is distributed in the hope that it will be useful, ;* but WITHOUT ANY WARRANTY; without even the implied warranty of -;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;* GNU General Public License for more details. +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. ;* -;* You should have received a copy of the GNU General Public License -;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. -;***************************************************************************** +;* You should have received a copy of the GNU Lesser General Public +;* License along with FFmpeg; if not, write to the Free Software +;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** %include "x86inc.asm"