--- branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/08/02 10:42:23	1106
+++ branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/08/02 15:08:48	1107
@@ -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: motion_est.h,v 1.3.2.13 2003-07-13 09:57:28 syskin Exp $
+ * $Id: motion_est.h,v 1.3.2.14 2003-08-02 15:08:45 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -292,39 +292,39 @@
 {
 	uint32_t Flags = MotionFlags;
 
-	if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))
-		Flags &= ~(XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS+XVID_ME_EXTSEARCH_BITS);
+	if (!(VopFlags & XVID_VOP_MODEDECISION_RD))
+		Flags &= ~(XVID_ME_QUARTERPELREFINE16_RD+XVID_ME_QUARTERPELREFINE8_RD+XVID_ME_HALFPELREFINE16_RD+XVID_ME_HALFPELREFINE8_RD+XVID_ME_EXTSEARCH_RD);
 
-	if (Flags & XVID_ME_EXTSEARCH_BITS)
-		Flags |= XVID_ME_HALFPELREFINE16_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_RD)
+		Flags |= XVID_ME_HALFPELREFINE16_RD;
 	
-	if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
-		Flags |= XVID_ME_HALFPELREFINE8_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_RD && MotionFlags & XVID_ME_EXTSEARCH8)
+		Flags |= XVID_ME_HALFPELREFINE8_RD;
 
-	if (Flags & XVID_ME_HALFPELREFINE16_BITS)
-		Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
+	if (Flags & XVID_ME_HALFPELREFINE16_RD)
+		Flags |= XVID_ME_QUARTERPELREFINE16_RD;
 
-	if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
-		Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
+	if (Flags & XVID_ME_HALFPELREFINE8_RD) {
+		Flags |= XVID_ME_QUARTERPELREFINE8_RD;
 		Flags &= ~XVID_ME_HALFPELREFINE8;
 	}
 
-	if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
+	if (Flags & XVID_ME_QUARTERPELREFINE8_RD)
 		Flags &= ~XVID_ME_QUARTERPELREFINE8;
 
 	if (!(VolFlags & XVID_VOL_QUARTERPEL))
-		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
+		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_RD+XVID_ME_QUARTERPELREFINE8_RD);
 
 	if (!(VopFlags & XVID_VOP_HALFPEL))
-		Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS);
+		Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_RD+XVID_ME_HALFPELREFINE8_RD);
 
 	if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
-		Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
+		Flags &= ~(XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP);
 
 	return Flags;
 }
 
-/* BITS mode decision and search */
+/* RD mode decision and search */
 
 #include "../bitstream/zigzag.h"
 #include "../quant/quant_mpeg4.h"