--- trunk/xvidcore/src/dct/idct.h 2005/01/05 23:02:15 1586 +++ trunk/xvidcore/src/dct/idct.h 2011/05/16 16:20:15 1979 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Inverse DCT header - * - * Copyright(C) 2001-2003 Michael Militzer + * Copyright(C) 2001-2011 Michael Militzer * * 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 @@ -19,13 +19,15 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: idct.h,v 1.11 2005-01-05 23:02:15 edgomez Exp $ + * $Id: idct.h,v 1.13 2008-11-26 01:04:34 Isibaar Exp $ * ****************************************************************************/ #ifndef _IDCT_H_ #define _IDCT_H_ +#include "../portab.h" + void idct_int32_init(); void idct_ia64_init(); @@ -37,14 +39,12 @@ idctFunc idct_int32; idctFunc simple_idct_c; /* Michael Niedermayer */ -#ifdef ARCH_IS_IA32 +#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) idctFunc idct_mmx; /* AP-992, Peter Gubanov, Michel Lespinasse */ idctFunc idct_xmm; /* AP-992, Peter Gubanov, Michel Lespinasse */ idctFunc idct_3dne; /* AP-992, Peter Gubanov, Michel Lespinasse, Jaan Kalda */ -idctFunc idct_sse2_skal; /* Skal's one, not IEEE 1180 compliant for range [-300..300[ */ +idctFunc idct_sse2_skal; /* Skal's one, IEEE 1180 compliant */ idctFunc idct_sse2_dmitry; /* Dmitry Rozhdestvensky */ -idctFunc simple_idct_mmx; /* Michael Niedermayer; expects permutated data */ -idctFunc simple_idct_mmx2; /* Michael Niedermayer */ #endif #ifdef ARCH_IS_IA64 @@ -55,8 +55,4 @@ idctFunc idct_altivec_c; #endif -#ifdef ARCH_IS_X86_64 -idctFunc idct_x86_64; -#endif - #endif /* _IDCT_H_ */