[FFmpeg-cvslog] r24408 - in trunk/libavcodec/x86: Makefile dsputil_mmx.c h264_deblock_sse2.asm
lorenm
subversion
Thu Jul 22 02:39:50 CEST 2010
Author: lorenm
Date: Thu Jul 22 02:39:49 2010
New Revision: 24408
Log:
relicense h264 deblock sse2 to lgpl
Modified:
trunk/libavcodec/x86/Makefile
trunk/libavcodec/x86/dsputil_mmx.c
trunk/libavcodec/x86/h264_deblock_sse2.asm
Modified: trunk/libavcodec/x86/Makefile
==============================================================================
--- trunk/libavcodec/x86/Makefile Thu Jul 22 00:59:28 2010 (r24407)
+++ trunk/libavcodec/x86/Makefile Thu Jul 22 02:39:49 2010 (r24408)
@@ -6,10 +6,10 @@ YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) +
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
Modified: trunk/libavcodec/x86/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.c Thu Jul 22 00:59:28 2010 (r24407)
+++ trunk/libavcodec/x86/dsputil_mmx.c Thu Jul 22 02:39:49 2010 (r24408)
@@ -2999,7 +2999,7 @@ void ff_h264dsp_init_x86(H264DSPContext
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 @@ void ff_h264dsp_init_x86(H264DSPContext
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
Modified: trunk/libavcodec/x86/h264_deblock_sse2.asm
==============================================================================
--- trunk/libavcodec/x86/h264_deblock_sse2.asm Thu Jul 22 00:59:28 2010 (r24407)
+++ trunk/libavcodec/x86/h264_deblock_sse2.asm Thu Jul 22 02:39:49 2010 (r24408)
@@ -5,20 +5,22 @@
;*
;* Authors: Loren Merritt <lorenm at 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"
More information about the ffmpeg-cvslog
mailing list