--- encoder.c	2002/07/11 00:15:59	1.54
+++ encoder.c	2002/07/18 23:52:40	1.56
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.54 2002/07/11 00:15:59 chenm001 Exp $
+ *  $Id: encoder.c,v 1.56 2002/07/18 23:52:40 chl Exp $
  *
  ****************************************************************************/
 
@@ -212,7 +212,6 @@
 	if (pParam->max_key_interval == 0)
 		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
 
-
 	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
 	if (pEnc == NULL)
 		return XVID_ERR_MEMORY;
@@ -237,6 +236,10 @@
 
 	pEnc->mbParam.m_quant_type = H263_QUANT;
 
+#ifdef _SMP
+	pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS);
+#endif
+
 	pEnc->sStat.fMvPrevSigma = -1;
 
 	/* Fill rate control parameters */
@@ -1595,20 +1598,18 @@
 	} else {
 
 #ifdef _SMP
-		if (NUMTHREADS > 1)
-			bIntra =
-				SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-							 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-							 iLimit);
-		else
+	if (pEnc->mbParam.num_threads > 1)
+		bIntra =
+			SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+						 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+						 iLimit);
+	else
 #endif
-
-                bIntra =
-                         MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-                                                    &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-                                                    iLimit);
-		
-	
+		bIntra =
+			MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+                         &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+                         iLimit);
+			
 	}
 	stop_motion_timer();
 
@@ -1843,7 +1844,7 @@
 
 			if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT)
 				&& mb->cbp == 0 && mb->mvs[0].x == 0 && mb->mvs[0].y == 0) {
-				mb->mode = 5;	// skipped
+				mb->mode = MODE_DIRECT_NONE_MV;	// skipped
 			}
 
 			if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) {