--- branches/dev-api-4/xvidcore/src/xvid.c	2003/06/09 13:55:56	1054
+++ branches/dev-api-4/xvidcore/src/xvid.c	2003/08/02 15:08:48	1107
@@ -19,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.6 2003-06-09 13:51:17 edgomez Exp $
+ * $Id: xvid.c,v 1.45.2.12 2003-08-02 15:08:30 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -163,7 +163,7 @@
 {
 	unsigned int cpu_flags;
 
-	if (XVID_MAJOR(init->version) != 1) /* v1.x.x */
+	if (XVID_VERSION_MAJOR(init->version) != 1) /* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();
@@ -288,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;
 	}
@@ -488,8 +487,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
 
@@ -516,7 +517,6 @@
 	  transfer_8to16sub2 = transfer_8to16sub2_ia64;
 	  transfer_16to8add = transfer_16to8add_ia64;
 	  transfer8x8_copy = transfer8x8_copy_ia64;
-	  DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines.");
 	}
 #endif 
 
@@ -549,7 +549,7 @@
 static int
 xvid_gbl_info(xvid_gbl_info_t * info)
 {
-	if (XVID_MAJOR(info->version) != 1) /* v1.x.x */
+	if (XVID_VERSION_MAJOR(info->version) != 1) /* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
@@ -575,7 +575,7 @@
 	int height2;
 	IMAGE img;
 
-	if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */
+	if (XVID_VERSION_MAJOR(convert->version) != 1)   /* v1.x.x */
 	      return XVID_ERR_VERSION;
 
 #if 0