--- encoder.c	2005/03/27 03:59:42	1.117
+++ encoder.c	2005/11/22 10:23:01	1.120
@@ -21,7 +21,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: encoder.c,v 1.117 2005/03/27 03:59:42 suxen_drol Exp $
+ * $Id: encoder.c,v 1.120 2005/11/22 10:23:01 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -85,20 +85,31 @@
 /*
  * Simplify the "fincr/fbase" fraction
 */
+static int
+gcd(int a, int b)
+{
+	int r ;
+
+	if (b > a) {
+		r = a;
+		a = b;
+		b = r;
+	}
+
+	while ((r = a % b)) {
+		a = b;
+		b = r;
+	}
+	return b;
+}
+
 static void
 simplify_time(int *inc, int *base)
 {
 	/* common factor */
-	int i = *inc;
-	while (i > 1) {
-		if (*inc % i == 0 && *base % i == 0) {
-			*inc /= i;
-			*base /= i;
-			i = *inc;
-			continue;
-		}
-		i--;
-	}
+	const int s = gcd(*inc, *base);
+  *inc  /= s;
+  *base /= s;
 
 	if (*base > 65535 || *inc > 65535) {
 		int *biggest;
@@ -114,8 +125,8 @@
 		}
 		
 		div = ((float)*biggest)/((float)65535);
-		*biggest = (int)(((float)*biggest)/div);
-		*other = (int)(((float)*other)/div);
+		*biggest = (unsigned int)(((float)*biggest)/div);
+		*other = (unsigned int)(((float)*other)/div);
 	}
 }
 
@@ -161,7 +172,7 @@
 	pEnc->mbParam.fincr = MAX(create->fincr, 0);
 	pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase;
 	if (pEnc->mbParam.fincr>0)
-		simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);
+		simplify_time((int*)&pEnc->mbParam.fincr, (int*)&pEnc->mbParam.fbase);
 
 	/* zones */
 	if(create->num_zones > 0) {
@@ -192,7 +203,7 @@
 
 		memset(&pinfo, 0, sizeof(xvid_plg_info_t));
 		pinfo.version = XVID_VERSION;
-		if (create->plugins[n].func(0, XVID_PLG_INFO, &pinfo, 0) >= 0) {
+		if (create->plugins[n].func(NULL, XVID_PLG_INFO, &pinfo, NULL) >= 0) {
 			pEnc->mbParam.plugin_flags |= pinfo.flags;
 		}
 
@@ -209,7 +220,7 @@
 		pcreate.param = create->plugins[n].param;
 
 		pEnc->plugins[n].func = NULL;   /* disable plugins that fail */
-		if (create->plugins[n].func(0, XVID_PLG_CREATE, &pcreate, &pEnc->plugins[n].param) >= 0) {
+		if (create->plugins[n].func(NULL, XVID_PLG_CREATE, &pcreate, &pEnc->plugins[n].param) >= 0) {
 			pEnc->plugins[n].func = create->plugins[n].func;
 		}
 	}
@@ -511,7 +522,7 @@
   xvid_err_memory0:
 	for (n=0; n<pEnc->num_plugins;n++) {
 		if (pEnc->plugins[n].func) {
-			pEnc->plugins[n].func(pEnc->plugins[n].param, XVID_PLG_DESTROY, 0, 0);
+			pEnc->plugins[n].func(pEnc->plugins[n].param, XVID_PLG_DESTROY, NULL, NULL);
 		}
 	}
 	xvid_free(pEnc->plugins);
@@ -616,7 +627,7 @@
 
 		for (i=0; i<pEnc->num_plugins;i++) {
 			if (pEnc->plugins[i].func) {
-				pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, &pdestroy, 0);
+				pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, &pdestroy, NULL);
 			}
 		}
 		xvid_free(pEnc->plugins);
@@ -776,7 +787,7 @@
 	for (i=0; i<(unsigned int)pEnc->num_plugins;i++) {
 		emms();
 		if (pEnc->plugins[i].func) {
-			if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) {
+			if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, NULL) < 0) {
 				continue;
 			}
 		}
@@ -874,24 +885,6 @@
 #endif
 }
 
-static int
-gcd(int a, int b)
-{
-	int r ;
-
-	if (b > a) {
-		r = a;
-		a = b;
-		b = r;
-	}
-
-	while ((r = a % b)) {
-		a = b;
-		b = r;
-	}
-	return b;
-}
-
 static void
 simplify_par(int *par_width, int *par_height)
 {
@@ -1017,7 +1010,7 @@
 			}
 
 			FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs);
-			call_plugins(pEnc, pEnc->bframes[pEnc->bframenum_head], &pEnc->sOriginal2, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->bframes[pEnc->bframenum_head], &pEnc->sOriginal2, XVID_PLG_AFTER, NULL, NULL, stats);
 			pEnc->bframenum_head++;
 
 			goto done;
@@ -1049,7 +1042,7 @@
 
 			/* add the not-coded length to the reference frame size */
 			pEnc->current->length += (BitstreamPos(&bs) - bits) / 8;
-			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 
 			/* flush complete: reset counters */
 			pEnc->flush_bframes = 0;
@@ -1077,7 +1070,7 @@
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
 			if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0) {
-				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 			}
 
 			/* if the very last frame is to be b-vop, we must change it to a p-vop */
@@ -1106,7 +1099,7 @@
 
 
 				if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail==0) {
-					call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+					call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 				}else{
 					pEnc->flush_bframes = 1;
 					goto done;
@@ -1155,7 +1148,7 @@
 	type = frame->type;
 	pEnc->current->quant = frame->quant;
 
-	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, &pEnc->current->quant, stats);
+	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, (int*)&pEnc->current->quant, stats);
 
 	if (type > 0){ 	/* XVID_TYPE_?VOP */
 		type = type2coding(type);	/* convert XVID_TYPE_?VOP to bitstream coding type */
@@ -1230,7 +1223,7 @@
 	if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0)
 	{
 		if (pEnc->current->stamp > 0) {
-			call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 		}
 		else
 			stats->type = XVID_TYPE_NOTHING;
@@ -1353,7 +1346,7 @@
 
 		if ( FrameCodeP(pEnc, &bs) == 0 ) {
 			/* N-VOP, we mustn't code b-frames yet */
-			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 			goto done;
 		}
 	}
@@ -1374,7 +1367,7 @@
 
 	/* packed or no-bframes or no-bframes-queued: output stats */
 	if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) || pEnc->mbParam.max_bframes == 0 ) {
-		call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+		call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 	}
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%