virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Switch idct_mmx_xvid.c from GPL to LGPL as permitted by the

Browse Source 
author, Peter Ross (pross xvid org).

Originally committed as revision 6557 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-10-05 00:23:24 +00:00
parent 777938e190
commit 0eb59ddba4
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/Makefile
View File

@ -322,6 +322,7 @@ OBJS += i386/fdct_mmx.o \
i386/mpegvideo_mmx.o \ i386/mpegvideo_mmx.o \
i386/motion_est_mmx.o \ i386/motion_est_mmx.o \
i386/simple_idct_mmx.o \ i386/simple_idct_mmx.o \
i386/idct_mmx_xvid.o \
i386/fft_sse.o \ i386/fft_sse.o \
i386/vp3dsp_mmx.o \ i386/vp3dsp_mmx.o \
i386/vp3dsp_sse2.o \ i386/vp3dsp_sse2.o \
@ -330,7 +331,7 @@ OBJS += i386/fdct_mmx.o \
i386/snowdsp_mmx.o \ i386/snowdsp_mmx.o \
ifeq ($(CONFIG_GPL),yes) ifeq ($(CONFIG_GPL),yes)
OBJS += i386/idct_mmx.o i386/idct_mmx_xvid.o OBJS += i386/idct_mmx.o
endif endif
ifeq ($(CONFIG_CAVS_DECODER),yes) ifeq ($(CONFIG_CAVS_DECODER),yes)
OBJS += i386/cavsdsp_mmx.o OBJS += i386/cavsdsp_mmx.o

4
libavcodec/i386/dsputil_mmx.c
View File

@ -2742,7 +2742,6 @@ static void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block)
ff_vp3_idct_mmx(block); ff_vp3_idct_mmx(block);
add_pixels_clamped_mmx(block, dest, line_size); add_pixels_clamped_mmx(block, dest, line_size);
} }
#ifdef CONFIG_GPL
static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block) static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block)
{ {
ff_idct_xvid_mmx (block); ff_idct_xvid_mmx (block);
@ -2763,7 +2762,6 @@ static void ff_idct_xvid_mmx2_add(uint8_t *dest, int line_size, DCTELEM *block)
ff_idct_xvid_mmx2 (block); ff_idct_xvid_mmx2 (block);
add_pixels_clamped_mmx(block, dest, line_size); add_pixels_clamped_mmx(block, dest, line_size);
} }
#endif
static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize)
{ {
@ -3121,7 +3119,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
} }
}else if(idct_algo==FF_IDCT_CAVS){ }else if(idct_algo==FF_IDCT_CAVS){
c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM; c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM;
#ifdef CONFIG_GPL
}else if(idct_algo==FF_IDCT_XVIDMMX){ }else if(idct_algo==FF_IDCT_XVIDMMX){
if(mm_flags & MM_MMXEXT){ if(mm_flags & MM_MMXEXT){
c->idct_put= ff_idct_xvid_mmx2_put; c->idct_put= ff_idct_xvid_mmx2_put;
@ -3132,7 +3129,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
c->idct_add= ff_idct_xvid_mmx_add; c->idct_add= ff_idct_xvid_mmx_add;
c->idct = ff_idct_xvid_mmx; c->idct = ff_idct_xvid_mmx;
} }
#endif
} }
} }

23
libavcodec/i386/idct_mmx_xvid.c
View File

@ -5,20 +5,19 @@
// * // *
// * Copyright(C) 2001 Peter Ross <pross@xvid.org> // * Copyright(C) 2001 Peter Ross <pross@xvid.org>
// * // *
// * This program is free software; you can redistribute it and/or modify it // * This library is free software; you can redistribute it and/or
// * under the terms of the GNU General Public License as published by // * modify it under the terms of the GNU Lesser General Public
// * the Free Software Foundation; either version 2 of the License, or // * License as published by the Free Software Foundation; either
// * (at your option) any later version. // * version 2 of the License, or (at your option) any later version.
// * // *
// * This program is distributed in the hope that it will be useful, // * This library is distributed in the hope that it will be useful,
// * but WITHOUT ANY WARRANTY; without even the implied warranty of // * but WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// * GNU General Public License for more details. // * Lesser General Public License for more details.
// * // *
// * You should have received a copy of the GNU General Public License // * You should have received a copy of the GNU Lesser General Public License
// * along with this program; if not, write to the Free Software Foundation, // * along with this library; if not, write to the Free Software Foundation,
// * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
// * // *
// * $Id$ // * $Id$
// * // *