--- xvid.c	2005/09/13 12:12:15	1.64
+++ xvid.c	2006/07/10 15:05:30	1.65.2.2
@@ -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.64 2005/09/13 12:12:15 suxen_drol Exp $
+ * $Id: xvid.c,v 1.65.2.2 2006/07/10 15:05:30 Isibaar 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;
@@ -636,7 +636,7 @@
 	 * features there really are. */
 	if (cpu_flags & XVID_CPU_ASM) {
 		/* SIMD state flusher */
-		emms = emms_3dn;
+		emms = emms_mmx;
 
 		/* DCT operators */
 		fdct = fdct_skal_x86_64;
@@ -712,7 +712,7 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.1.0-beta2";
+	info->build = "xvid-1.1.0";
 	info->cpu_flags = detect_cpu_flags();
 
 #if defined(_SMP) && defined(WIN32)