Mercurial > libavcodec.hg
changeset 12480:14896fa76003 libavcodec
LGPL SSE2 H.264 iDCT
This leaves no more GPL-only H.264 decoding asm code.
Approved by Loren.
| author | darkshikari |
|---|---|
| date | Fri, 10 Sep 2010 02:25:12 +0000 |
| parents | ca1896830b44 |
| children | e9a1e1ba768f |
| files | x86/Makefile x86/h264_idct_sse2.asm x86/h264dsp_mmx.c |
| diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/x86/Makefile Thu Sep 09 20:23:41 2010 +0000 +++ b/x86/Makefile Fri Sep 10 02:25:12 2010 +0000 @@ -6,11 +6,11 @@ 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
--- a/x86/h264_idct_sse2.asm Thu Sep 09 20:23:41 2010 +0000 +++ b/x86/h264_idct_sse2.asm Fri Sep 10 02:25:12 2010 +0000 @@ -8,19 +8,21 @@ ;* Holger Lubitz <hal@duncan.ol.sub.de> ;* Min Chen <chenm001.163.com> ;* -;* 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"
--- a/x86/h264dsp_mmx.c Thu Sep 09 20:23:41 2010 +0000 +++ b/x86/h264dsp_mmx.c Fri Sep 10 02:25:12 2010 +0000 @@ -475,7 +475,7 @@ } } -#if CONFIG_GPL && HAVE_YASM +#if HAVE_YASM static void ff_h264_idct_dc_add8_mmx2(uint8_t *dst, int16_t *block, int stride) { __asm__ volatile( @@ -820,11 +820,9 @@ 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 } if (mm_flags&AV_CPU_FLAG_SSSE3) { c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16x16_ssse3;