--- xvid_stat.c	2002/12/18 20:48:25	1.17
+++ xvid_stat.c	2003/02/22 21:37:49	1.22
@@ -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_stat.c,v 1.17 2002/12/18 20:48:25 edgomez Exp $
+ * $Id: xvid_stat.c,v 1.22 2003/02/22 21:37:49 chl Exp $
  *
  ****************************************************************************/
 
@@ -66,7 +66,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/time.h>
 #else
 #include <time.h>
@@ -204,12 +204,12 @@
 	double totalenctime=0.;
 	double totaldectime=0.;
   
-	long totalsize=0;
-	long hints_size;
+	long totalsize = 0;
+	long hints_size = 0;
 	int status;
-	int bigendian;
+	int bigendian = 0;
 
-	long m4v_size;
+	long m4v_size = 0;
 	long frame_type[ABS_MAXFRAMENR];
 	int Iframes=0, Pframes=0, use_assembler=0;
 	double framepsnr[ABS_MAXFRAMENR];
@@ -413,6 +413,7 @@
 		bigendian = 1;
 	else
 		bigendian = 0;
+	totalsize = 0;
 
 /*****************************************************************************
  *                            Main loop
@@ -636,7 +637,7 @@
 /* Return time elapsed time in miliseconds since the program started */
 static double msecond()
 {	
-#ifndef _MSC_VER
+#ifndef WIN32
 	struct timeval  tv;
 	gettimeofday(&tv, 0);
 	return tv.tv_sec*1.0e3 + tv.tv_usec * 1.0e-3;
@@ -852,7 +853,7 @@
 
 	if(use_assembler) {
 
-#ifdef ARCH_IA64
+#ifdef ARCH_IS_IA64
 		xinit.cpu_flags = XVID_CPU_FORCE | XVID_CPU_IA64;
 #else
 		xinit.cpu_flags = 0;
@@ -914,7 +915,7 @@
 	xframe.length = -1; 	/* this is written by the routine */
 
 	xframe.image = image;
-	xframe.colorspace = XVID_CSP_YV12;	/* defined in <xvid.h> */
+	xframe.colorspace = XVID_CSP_I420;	/* defined in <xvid.h> */
 
 	xframe.intra = -1; /* let the codec decide between I-frame (1) and P-frame (0) */
 
@@ -996,7 +997,7 @@
 	xframe.length = m4v_size;
 	xframe.image = out_buffer;
 	xframe.stride = XDIM;
-	xframe.colorspace = XVID_CSP_YV12;             /* XVID_CSP_USER is fastest (no memcopy involved) */
+	xframe.colorspace = XVID_CSP_I420;             /* XVID_CSP_USER is fastest (no memcopy involved) */
 
 	xerr = xvid_decore(dec_handle, XVID_DEC_DECODE, &xframe, NULL);