--- xvid.c	2003/05/03 23:23:55	1.45.4.1
+++ xvid.c	2003/06/09 17:07:10	1.46
@@ -17,7 +17,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.4.1 2003/05/03 23:23:55 Isibaar Exp $
+ * $Id: xvid.c,v 1.46 2003/06/09 17:07:10 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -44,7 +44,6 @@
 #include "utils/emms.h"
 #include "utils/timer.h"
 #include "bitstream/mbcoding.h"
-#include "image/qpel.h"
 
 #if defined(ARCH_IS_IA32)
 
@@ -182,10 +181,6 @@
 
 	init_param->cpu_flags = cpu_flags;
 
-	/* Qpel stuff */
-	xvid_QP_Funcs = &xvid_QP_Funcs_C;
-	xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_C;
-	xvid_Init_QP_mmx();
 
 	/* Initialize the function pointers */
 	idct_int32_init();
@@ -323,14 +318,9 @@
 
 	if ((cpu_flags & XVID_CPU_MMX)) {
 
-		/* Qpel stuff */
-		xvid_QP_Funcs = &xvid_QP_Funcs_mmx;
-		xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_mmx;
-		xvid_Init_QP_mmx();
-
 		/* Forward and Inverse Discrete Cosine Transformation functions */
 		fdct = fdct_mmx;
-		idct = idct_mmx;
+		idct = simple_idct_mmx; /* use simple idct by default */
 
 		/* Quantization related functions */
 		quant_intra   = quant_intra_mmx;
@@ -416,7 +406,7 @@
 	if ((cpu_flags & XVID_CPU_MMXEXT)) {
 
 		/* Inverse DCT */
-		idct = idct_xmm;
+		/* idct = idct_xmm; Don't use Walken idct anymore! */
 
 		/* Interpolation */
 		interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_xmm;
@@ -462,7 +452,7 @@
 	if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
 
 		/* Inverse DCT */
-		idct =  idct_3dne;
+		/* idct =  idct_3dne; Don't use Walken idct anymore */
 
 		/* Buffer transfer */
 		transfer_8to16copy =  transfer_8to16copy_3dne;
@@ -512,8 +502,8 @@
 		dev16    = dev16_sse2;
 #endif
 		/* Forward and Inverse DCT */
-		idct  = idct_sse2;
-		fdct = fdct_sse2;
+		/* idct  = idct_sse2;
+		/* fdct = fdct_sse2; Both are none to be unprecise - better deactivate for now */
 	}
 #endif