--- decoder.c	2003/08/02 15:08:12	1.49.2.10
+++ decoder.c	2003/09/24 01:38:29	1.49.2.12
@@ -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.10 2003/08/02 15:08:12 edgomez Exp $
+ * $Id: decoder.c,v 1.49.2.12 2003/09/24 01:38:29 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -915,14 +915,11 @@
 
 				intra = (mb->mode == MODE_INTRA || mb->mode == MODE_INTRA_Q);
 
-				if (intra) {
-					acpred_flag = BitstreamGetBit(bs);
-				}
-
 				if (gmc_warp && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q))
-				{
 					mcsel = BitstreamGetBit(bs);
-				}
+
+				if (intra)
+					acpred_flag = BitstreamGetBit(bs);
 
 				cbpy = get_cbpy(bs, intra);
 				DPRINTF(XVID_DEBUG_MB, "cbpy %i  mcsel %i \n", cbpy,mcsel);
@@ -1731,7 +1728,6 @@
 	WARPPOINTS gmc_warp;
 	int coding_type;
 	int success, output, seen_something;
-	idctFuncPtr idct_save;
 
 	if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))	/* v1.x.x */
 		return XVID_ERR_VERSION;
@@ -1777,7 +1773,6 @@
 	success = 0;
 	output = 0;
 	seen_something = 0;
-	idct_save = idct;
 
 repeat:
 
@@ -1819,15 +1814,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 +1942,5 @@
 	emms();
 	stop_global_timer();
 
-	idct = idct_save;
-
 	return BitstreamPos(&bs) / 8;	/* number of bytes consumed */
 }