Mercurial > libavcodec.hg
diff i386/dsputil_mmx.c @ 3932:d13da74a26f5 libavcodec
Switch idct_mmx_xvid.c from GPL to LGPL as permitted by the
author, Peter Ross (pross xvid org).
author | diego |
---|---|
date | Thu, 05 Oct 2006 00:23:24 +0000 |
parents | 6a40092eb9e6 |
children | c8c591fe26f8 |
line wrap: on
line diff
--- a/i386/dsputil_mmx.c Wed Oct 04 21:42:31 2006 +0000 +++ b/i386/dsputil_mmx.c Thu Oct 05 00:23:24 2006 +0000 @@ -2742,7 +2742,6 @@ ff_vp3_idct_mmx(block); 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) { ff_idct_xvid_mmx (block); @@ -2763,7 +2762,6 @@ ff_idct_xvid_mmx2 (block); add_pixels_clamped_mmx(block, dest, line_size); } -#endif static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) { @@ -3121,7 +3119,6 @@ } }else if(idct_algo==FF_IDCT_CAVS){ c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM; -#ifdef CONFIG_GPL }else if(idct_algo==FF_IDCT_XVIDMMX){ if(mm_flags & MM_MMXEXT){ c->idct_put= ff_idct_xvid_mmx2_put; @@ -3132,7 +3129,6 @@ c->idct_add= ff_idct_xvid_mmx_add; c->idct = ff_idct_xvid_mmx; } -#endif } }