--- xvid_encraw.c	2010/12/18 16:02:08	1.46
+++ xvid_encraw.c	2011/02/03 15:01:06	1.46.2.3
@@ -22,7 +22,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_encraw.c,v 1.46 2010/12/18 16:02:08 Isibaar Exp $
+ * $Id: xvid_encraw.c,v 1.46.2.3 2011/02/03 15:01:06 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -200,7 +200,7 @@
 static 	char *ARG_PASS2 = 0;
 //static int ARG_QUALITY = ME_ELEMENTS - 1;
 static 	int ARG_QUALITY = 6;
-static 	float ARG_FRAMERATE = 25.00f;
+static 	float ARG_FRAMERATE = 0.f;
 static 	int ARG_DWRATE = 25;
 static 	int ARG_DWSCALE = 1;
 static 	int ARG_MAXFRAMENR = ABS_MAXFRAMENR;
@@ -353,7 +353,7 @@
 
 	/* Is there a dumb Xvid coder ? */
 	if(ME_ELEMENTS != VOP_ELEMENTS) {
-		fprintf(stderr, "Presets' arrays should have the same number of elements -- Please fill a bug to xvid-devel@xvid.org\n");
+		fprintf(stderr, "Presets' arrays should have the same number of elements -- Please file a bug to xvid-devel@xvid.org\n");
 		return(-1);
 	}
 
@@ -485,7 +485,7 @@
 				memset(&ZONES[NUM_ZONES], 0, sizeof(zone_t));
 
 				ZONES[NUM_ZONES].frame = startframe;
-				ZONES[NUM_ZONES].modifier = atof(options)*100;
+				ZONES[NUM_ZONES].modifier = (int)(atof(options)*100);
 				if (toupper(c)=='Q')
 					ZONES[NUM_ZONES].mode = XVID_ZONE_QUANT;
 				else if (toupper(c)=='W')
@@ -498,7 +498,7 @@
 				if ((frameoptions=strchr(options, ','))!=NULL) {
 					int readchar=0, count;
 					frameoptions++;
-					while (readchar<strlen(frameoptions)) {
+					while (readchar<(int)strlen(frameoptions)) {
 						if (sscanf(frameoptions+readchar, "%d%n", &(ZONES[NUM_ZONES].bvop_threshold), &count)==1) {
 							readchar += count;
 						}
@@ -536,7 +536,7 @@
 			else {
 				ZONES[NUM_ZONES].mode = XVID_ZONE_WEIGHT;
 			}
-			ZONES[NUM_ZONES].modifier = atof(argv[i+2])*100;
+			ZONES[NUM_ZONES].modifier = (int)(atof(argv[i+2])*100);
 			i++;
             ZONES[NUM_ZONES].frame = atoi(argv[i]);
 			i++;
@@ -563,12 +563,12 @@
 			int exponent;
 			i++;
 			ARG_FRAMERATE = (float) atof(argv[i]);
-			exponent = strcspn(argv[i], ".");
-			if (exponent<strlen(argv[i]))
-				exponent=pow(10.0, (int)(strlen(argv[i])-1-exponent));
+			exponent = (int) strcspn(argv[i], ".");
+			if (exponent<(int)strlen(argv[i]))
+				exponent=(int)pow(10.0, (int)(strlen(argv[i])-1-exponent));
 			else
 				exponent=1;
-			ARG_DWRATE = atof(argv[i])*exponent;
+			ARG_DWRATE = (int)(atof(argv[i])*exponent);
 			ARG_DWSCALE = exponent;
 			exponent = gcd(ARG_DWRATE, ARG_DWSCALE);
 			ARG_DWRATE /= exponent;
@@ -753,7 +753,7 @@
 				i++;
 			else
 				ARG_PROGRESS = 10;
-		} else if (strcmp("-help", argv[i])) {
+		} else if (strcmp("-help", argv[i]) == 0) {
 			usage();
 			return (0);
 		} else {
@@ -900,7 +900,7 @@
 				temp = (unsigned char*)AVIStreamGetFrame(get_frame, 0);
 				if (temp != NULL) {
 					int i;
-					for (i = 0; i < ((DWORD*)temp)[0]; i++) {
+					for (i = 0; i < (int)((DWORD*)temp)[0]; i++) {
 						fprintf(stderr, "%2d ", temp[i]);
 					}
 					fprintf(stderr, "\n");
@@ -916,7 +916,7 @@
           if (ARG_MAXFRAMENR<0)
 			ARG_MAXFRAMENR = avi_info.dwLength-ARG_STARTFRAMENR;
 		  else
-			ARG_MAXFRAMENR = min(ARG_MAXFRAMENR, avi_info.dwLength-ARG_STARTFRAMENR);
+			ARG_MAXFRAMENR = min(ARG_MAXFRAMENR, (int) (avi_info.dwLength-ARG_STARTFRAMENR));
 
 		  XDIM = avi_info.rcFrame.right - avi_info.rcFrame.left;
 		  YDIM = avi_info.rcFrame.bottom - avi_info.rcFrame.top;
@@ -951,8 +951,7 @@
 	}
 
 	if (ARG_FRAMERATE <= 0) {
-		fprintf(stderr, "Wrong Framerate %f\n", ARG_FRAMERATE);
-		return (-1);
+		ARG_FRAMERATE = 25.00f; /* default value */
 	}
 
 	if (ARG_TARGETSIZE) {
@@ -963,7 +962,7 @@
 				fprintf(stderr, "Parameter conflict: Do not specify both -bitrate and -size\n");
 				goto release_all;
 		} else
-			ARG_BITRATE = ((ARG_TARGETSIZE * 8) / (ARG_MAXFRAMENR / ARG_FRAMERATE)) * 1024;
+			ARG_BITRATE = (int) (((ARG_TARGETSIZE * 8) / (ARG_MAXFRAMENR / ARG_FRAMERATE)) * 1024);
 	}
 
 		/* Set constant quant to default if no bitrate given for single pass */
@@ -1300,7 +1299,7 @@
 				temp = (unsigned char*)AVIStreamGetFrame(get_frame, 0);
 				if (temp != NULL) {
 					int i;
-					for (i = 0; i < ((DWORD*)temp)[0]; i++) {
+					for (i = 0; i < (int)((DWORD*)temp)[0]; i++) {
 						fprintf(stderr, "%2d ", temp[i]);
 					}
 					fprintf(stderr, "\n");
@@ -1410,7 +1409,7 @@
 			myAVIStreamInfo.dwRate = ARG_DWRATE;
 			myAVIStreamInfo.dwLength = ARG_MAXFRAMENR;
 			myAVIStreamInfo.dwQuality = 10000;
-			SetRect(&myAVIStreamInfo.rcFrame, 0, 0, YDIM, XDIM);
+			SetRect(&myAVIStreamInfo.rcFrame, 0, 0, XDIM, YDIM);
 
 			if (avierr=AVIFileOpen(&myAVIFile, ARG_AVIOUTPUTFILE, OF_CREATE|OF_WRITE, NULL)) {
 				fprintf(stderr, "AVIFileOpen failed opening output file %s, error code %d\n", ARG_AVIOUTPUTFILE, avierr);
@@ -1527,7 +1526,7 @@
  *                       Encode and decode this frame
  ****************************************************************************/
 
-		if ((input_num+start_num) >= (unsigned int)(stop_num-1) && ARG_MAXBFRAMES) {
+		if ((unsigned int)(input_num+start_num) >= (unsigned int)(stop_num-1) && ARG_MAXBFRAMES) {
 			stats_type = XVID_TYPE_PVOP;
 		}
 		else
@@ -1839,7 +1838,7 @@
 	fprintf(stderr,	" -bquant_offset integer: bframe quantizer offset (100)\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Rate control options:\n");
-	fprintf(stderr, " -framerate float               : target framerate (25.0)\n");
+	fprintf(stderr, " -framerate float               : target framerate (auto)\n");
 	fprintf(stderr,	" -bitrate   [integer]           : target bitrate in kbps (700)\n");
 	fprintf(stderr, " -size      integer			 : target size in kilobytes\n");
     fprintf(stderr,	" -single                        : single pass mode (default)\n");
@@ -1931,7 +1930,7 @@
 	int bytes, xsize, ysize, depth;
 	char dummy[2];
 
-	bytes = fread(dummy, 1, 2, handle);
+	bytes = (int) fread(dummy, 1, 2, handle);
 
 	if ((bytes < 2) || (dummy[0] != 'P') || (dummy[1] != '5'))
 		return (1);
@@ -2591,7 +2590,7 @@
 
 		ZONES[NUM_ZONES].frame = 0;
 		ZONES[NUM_ZONES].mode = XVID_ZONE_QUANT;
-		ZONES[NUM_ZONES].modifier = ARG_CQ;
+		ZONES[NUM_ZONES].modifier = (int) ARG_CQ;
 		ZONES[NUM_ZONES].type = XVID_TYPE_AUTO;
 		ZONES[NUM_ZONES].greyscale = 0;
 		ZONES[NUM_ZONES].chroma_opt = 0;
@@ -2607,7 +2606,7 @@
 	for(i = 0; i < NUM_ZONES; i++)
 		if (ZONES[i].mode == XVID_ZONE_WEIGHT) {
 			ZONES[i].mode = XVID_ZONE_QUANT;
-			ZONES[i].modifier = (100*ARG_CQ) / ZONES[i].modifier;
+			ZONES[i].modifier = (int) ((100*ARG_CQ) / ZONES[i].modifier);
 		}
 }
 
@@ -2676,7 +2675,7 @@
 	int i;
 	char* userdata;
 
-	for (i=0; i <= (bufsize-sizeof(userdata_start_code)); i++) {
+	for (i=0; i <= (int)(bufsize-sizeof(userdata_start_code)); i++) {
 		if (memcmp((void*)userdata_start_code, (void*)(buf+i), strlen(userdata_start_code))==0) {
 			if ((userdata = strstr(buf+i+4, "DivX"))!=NULL) {
 				userdata[strlen(userdata)-1] = '\0';