--- xvid.c	2003/05/17 13:26:42	1.45.2.4
+++ xvid.c	2003/06/09 19:42:08	1.45.2.7
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Native API implementation  -
  *
+ *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *
  *  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
@@ -17,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.c,v 1.45.2.4 2003/05/17 13:26:42 suxen_drol Exp $
+ * $Id: xvid.c,v 1.45.2.7 2003/06/09 19:42:08 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -286,8 +288,7 @@
 
 #if defined(ARCH_IS_IA32)
 
-	if ((cpu_flags & XVID_CPU_ASM))
-	{
+	if ((cpu_flags & XVID_CPU_ASM))	{
 		vfilter_31 = xvid_VFilter_31_x86;
 		hfilter_31 = xvid_HFilter_31_x86;
 	}
@@ -304,7 +305,7 @@
 
 		/* Forward and Inverse Discrete Cosine Transformation functions */
 		fdct = fdct_mmx;
-		idct = idct_mmx;
+		idct = simple_idct_mmx;
 
 		/* Quantization related functions */
 		quant_intra   = quant_intra_mmx;
@@ -390,7 +391,9 @@
 	if ((cpu_flags & XVID_CPU_MMXEXT)) {
 
 		/* Inverse DCT */
+#if 0 /* We don't use  Walken idct anymore! */
 		idct = idct_xmm;
+#endif
 
 		/* Interpolation */
 		interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_xmm;
@@ -436,7 +439,9 @@
 	if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
 
 		/* Inverse DCT */
+#if 0 /* We don't use  Walken idct anymore! */
 		idct =  idct_3dne;
+#endif
 
 		/* Buffer transfer */
 		transfer_8to16copy =  transfer_8to16copy_3dne;
@@ -486,8 +491,10 @@
 		dev16    = dev16_sse2;
 #endif
 		/* Forward and Inverse DCT */
+#if 0 /* Both function are known to be unprecise, better keep them deactivated */
 		idct  = idct_sse2;
 		fdct = fdct_sse2;
+#endif
 	}
 #endif
 
@@ -576,7 +583,9 @@
 	if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */
 	      return XVID_ERR_VERSION;
 
-	// const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
+#if 0
+	const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
+#endif
 	width = convert->width;
 	height = convert->height;
 	width2 = convert->width/2;