--- trunk/xvidcore/src/encoder.c	2002/06/12 20:38:41	195
+++ trunk/xvidcore/src/encoder.c	2002/06/14 13:21:35	208
@@ -36,13 +36,14 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.41 2002-06-12 20:38:40 edgomez Exp $
+ *  $Id: encoder.c,v 1.43 2002-06-14 13:21:35 Isibaar Exp $
  *
  ****************************************************************************/
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
 
 #include "encoder.h"
 #include "prediction/mbprediction.h"
@@ -207,6 +208,10 @@
 	if (pEnc == NULL)
 		return XVID_ERR_MEMORY;
 
+	/* Zero the Encoder Structure */
+
+	memset(pEnc, 0, sizeof(Encoder));
+
 	/* Fill members of Encoder structure */
 
 	pEnc->mbParam.width = pParam->width;
@@ -221,6 +226,8 @@
 	pEnc->mbParam.fbase = pParam->fbase;
 	pEnc->mbParam.fincr = pParam->fincr;
 
+	pEnc->mbParam.m_quant_type = H263_QUANT;
+
 	pEnc->sStat.fMvPrevSigma = -1;
 
 	/* Fill rate control parameters */
@@ -640,7 +647,7 @@
 
 	SWAP(pEnc->current, pEnc->reference);
 
-	EMMS();
+	emms();
 
 	if (pFrame->quant == 0)
 		pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0);
@@ -673,7 +680,7 @@
 			   pEnc->mbParam.edged_width, pEnc->mbParam.height);
 #endif
 
-	EMMS();
+	emms();
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	 * Luminance masking
@@ -802,7 +809,7 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
 
-	EMMS();
+	emms();
 
 #ifdef _DEBUG
 	psnr =
@@ -876,7 +883,7 @@
 			   pEnc->mbParam.edged_width, pEnc->mbParam.height);
 #endif
 
-	EMMS();
+	emms();
 
 	BitstreamInit(&bs, pFrame->bitstream, 0);
 
@@ -975,7 +982,7 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
 
-	EMMS();
+	emms();
 
 	if (pFrame->quant == 0) {
 		RateControlUpdate(&pEnc->rate_control, pEnc->current->quant,