openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the LGPL exception clause as discussed on ffmpeg-devel

Browse Source 
and move the dependent code under CONFIG_GPL.

Originally committed as revision 6248 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-09-14 00:38:03 +00:00
parent fbb9d1043d
commit 7f889a76ad
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/Makefile
View File

@ -292,11 +292,11 @@ endif
ifeq ($(TARGET_MMX),yes)
OBJS += i386/fdct_mmx.o i386/cputest.o \
i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
i386/idct_mmx.o i386/motion_est_mmx.o \
i386/motion_est_mmx.o \
i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o
ifeq ($(CONFIG_GPL),yes)
OBJS += i386/idct_mmx_xvid.o
OBJS += i386/idct_mmx.o i386/idct_mmx_xvid.o
endif
ifeq ($(CONFIG_CAVS_DECODER),yes)
OBJS += i386/cavsdsp_mmx.o

2
libavcodec/i386/dsputil_mmx.c
View File

@ -3042,6 +3042,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
c->idct_add= ff_simple_idct_add_mmx;
c->idct = ff_simple_idct_mmx;
c->idct_permutation_type= FF_SIMPLE_IDCT_PERM;
#ifdef CONFIG_GPL
}else if(idct_algo==FF_IDCT_LIBMPEG2MMX){
if(mm_flags & MM_MMXEXT){
c->idct_put= ff_libmpeg2mmx2_idct_put;
@ -3053,6 +3054,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
c->idct = ff_mmx_idct;
}
c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
#endif
}else if(idct_algo==FF_IDCT_VP3 &&
!(avctx->flags & CODEC_FLAG_BITEXACT)){
if(mm_flags & MM_SSE2){

3
libavcodec/i386/idct_mmx.c
View File

@ -1,6 +1,3 @@
/*
* Note: For libavcodec, this code can also be used under the LGPL license
*/
/*
* idct_mmx.c
* Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>