--- trunk/xvidcore/src/xvid.c	2005/04/04 23:49:37	1609
+++ trunk/xvidcore/src/xvid.c	2005/11/22 10:53:10	1656
@@ -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.62 2005-04-04 23:49:37 edgomez Exp $
+ * $Id: xvid.c,v 1.66 2005-11-22 10:53:10 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -126,7 +126,7 @@
 
 /* detect cpu flags  */
 static unsigned int
-detect_cpu_flags()
+detect_cpu_flags(void)
 {
 	/* enable native assembly optimizations by default */
 	unsigned int cpu_flags = XVID_CPU_ASM;
@@ -183,7 +183,7 @@
 	idct = idct_int32;
 
 	/* Only needed on PPC Altivec archs */
-	sadInit = 0;
+	sadInit = NULL;
 
 	/* Restore FPU context : emms_c is a nop functions */
 	emms = emms_c;
@@ -213,6 +213,7 @@
 	transfer_8to16sub2ro = transfer_8to16sub2ro_c;
 	transfer_16to8add  = transfer_16to8add_c;
 	transfer8x8_copy   = transfer8x8_copy_c;
+	transfer8x4_copy   = transfer8x4_copy_c;
 
 	/* Interlacing functions */
 	MBFieldTest = MBFieldTest_c;
@@ -222,6 +223,10 @@
 	interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
 	interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
 
+	interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_c;
+	interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_c;
+	interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_c;
+
 	interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;
 	interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;
 	interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;
@@ -340,6 +345,7 @@
 		transfer_8to16sub2 = transfer_8to16sub2_mmx;
 		transfer_16to8add  = transfer_16to8add_mmx;
 		transfer8x8_copy   = transfer8x8_copy_mmx;
+		transfer8x4_copy   = transfer8x4_copy_mmx;
 
 		/* Interlacing Functions */
 		MBFieldTest = MBFieldTest_mmx;
@@ -349,6 +355,10 @@
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
 
+		interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_mmx;
+		interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_mmx;
+		interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_mmx;
+
 		interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;
 		interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;
 		interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;
@@ -416,6 +426,10 @@
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
 		
+		interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_xmm;
+		interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_xmm;
+		interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_xmm;
+		
 		interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;
 		interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;
 		interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;
@@ -452,6 +466,10 @@
 		interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn;
 		interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;
+
+		interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dn;
+		interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dn;
+		interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dn;
 	}
 
 	if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
@@ -463,6 +481,7 @@
 		transfer_8to16subro =  transfer_8to16subro_3dne;
 		transfer_16to8add = transfer_16to8add_3dne;
 		transfer8x8_copy = transfer8x8_copy_3dne;
+		transfer8x4_copy = transfer8x4_copy_3dne;
 
 		if ((cpu_flags & XVID_CPU_MMXEXT)) {
 			/* Inverse DCT */
@@ -476,6 +495,10 @@
 			interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;
 			interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
 
+			interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dne;
+			interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dne;
+			interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dne;
+
 			/* Quantization */
 			quant_h263_intra = quant_h263_intra_3dne;		/* cmov only */
 			quant_h263_inter = quant_h263_inter_3dne;
@@ -509,9 +532,9 @@
 		sad16    = sad16_sse2;
 		dev16    = dev16_sse2;
 
-		/* DCT operators
-		 * no iDCT because it's not "Walken matching" */
+		/* DCT operators */
 		fdct = fdct_sse2_skal;
+    /* idct = idct_sse2_skal; */   /* Is now IEEE1180 and Walken compliant. Disabled until fully tested. */
 
 		/* postprocessing */
 		image_brightness = image_brightness_sse2;
@@ -689,7 +712,7 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.1.0-beta2";
+	info->build = "xvid-1.2.0-dev";
 	info->cpu_flags = detect_cpu_flags();
 
 #if defined(_SMP) && defined(WIN32)