--- decoder.c	2003/06/28 15:48:39	1.49.2.9
+++ decoder.c	2003/08/13 11:43:47	1.49.2.11
@@ -20,7 +20,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: decoder.c,v 1.49.2.9 2003/06/28 15:48:39 chl Exp $
+ * $Id: decoder.c,v 1.49.2.11 2003/08/13 11:43:47 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -169,7 +169,7 @@
 {
 	DECODER *dec;
 
-	if (XVID_MAJOR(create->version) != 1)	/* v1.x.x */
+	if (XVID_VERSION_MAJOR(create->version) != 1)	/* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	dec = xvid_malloc(sizeof(DECODER), CACHE_LINE);
@@ -1731,9 +1731,8 @@
 	WARPPOINTS gmc_warp;
 	int coding_type;
 	int success, output, seen_something;
-	idctFuncPtr idct_save;
 
-	if (XVID_MAJOR(frame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1))	/* v1.x.x */
+	if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))	/* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	start_global_timer();
@@ -1777,7 +1776,6 @@
 	success = 0;
 	output = 0;
 	seen_something = 0;
-	idct_save = idct;
 
 repeat:
 
@@ -1819,15 +1817,6 @@
 
 	dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;	/* init pred vector to 0 */
 
-#if defined(ARCH_IS_IA32)
-	/*
-	 * /!\ Ugly hack /!\
-	 * IA32: Prior to xvid bitstream 10, we were using Walten's mmx/xmm idct
-	 */
-	if((idct == simple_idct_mmx) && (dec->bs_version < 10))
-		idct = idct_mmx;
-#endif
-
 	/* packed_mode: special-N_VOP treament */
 	if (dec->packed_mode && coding_type == N_VOP)
 	{
@@ -1956,7 +1945,5 @@
 	emms();
 	stop_global_timer();
 
-	idct = idct_save;
-
 	return BitstreamPos(&bs) / 8;	/* number of bytes consumed */
 }