--- branches/dev-api-4/xvidcore/src/xvid.c	2003/06/09 19:42:25	1058
+++ 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.7 2003-06-09 19:42:08 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();
@@ -305,7 +305,7 @@
 
 		/* Forward and Inverse Discrete Cosine Transformation functions */
 		fdct = fdct_mmx;
-		idct = simple_idct_mmx;
+		idct = idct_mmx;
 
 		/* Quantization related functions */
 		quant_intra   = quant_intra_mmx;
@@ -391,9 +391,7 @@
 	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;
@@ -439,9 +437,7 @@
 	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;
@@ -521,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 
 
@@ -554,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;
@@ -580,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