--- branches/dev-api-3/xvidcore/src/encoder.c	2002/12/12 12:42:31	709
+++ branches/dev-api-3/xvidcore/src/encoder.c	2002/12/14 06:07:03	715
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.76.2.29 2002-12-12 12:42:31 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.76.2.31 2002-12-14 06:07:02 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -1608,7 +1608,8 @@
 	if ((pEnc->current->global_flags & XVID_REDUCED))
 	{
 		image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, 
-			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width);
+			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
+			16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV);
 	}
 	emms();
 
@@ -1690,20 +1691,15 @@
 		pEnc->current->coding_type = P_VOP;
 	
 	start_timer();
-	if (pEnc->current->global_flags & XVID_HINTEDME_SET) {
+	if (pEnc->current->global_flags & XVID_HINTEDME_SET)
 		HintedMESet(pEnc, &bIntra);
-	if (bIntra == 0) {
-			MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference,
-											&pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);
-		}
-
-	} else {
+	else
 
 		bIntra =
 			MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
                          &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
                          iLimit);
-	}
+
 	stop_motion_timer();
 
 	if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits);
@@ -1853,7 +1849,8 @@
 	if ((pEnc->current->global_flags & XVID_REDUCED))
 	{
 		image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, 
-			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width);
+			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
+			16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV);
 	}
 
 	emms();