--- branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/03/26 11:01:03	948
+++ branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/03/26 14:56:49	949
@@ -26,7 +26,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.1 2003-02-22 08:49:45 suxen_drol Exp $
+ *  $Id: motion_est.h,v 1.3.2.2 2003-03-26 14:56:49 edgomez Exp $
  *
  ***************************************************************************/
 
@@ -250,34 +250,34 @@
 {
 	uint32_t Flags = MotionFlags;
 
-	if (!(VopFlags & XVID_MODEDECISION_BITS))
-		Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);
+	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 (Flags & EXTSEARCH_BITS)
-		Flags |= HALFPELREFINE16_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_BITS)
+		Flags |= XVID_ME_HALFPELREFINE16_BITS;
 	
-	if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)
-		Flags |= HALFPELREFINE8_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
+		Flags |= XVID_ME_HALFPELREFINE8_BITS;
 
-	if (Flags & HALFPELREFINE16_BITS)
-		Flags |= QUARTERPELREFINE16_BITS;
+	if (Flags & XVID_ME_HALFPELREFINE16_BITS)
+		Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
 
-	if (Flags & HALFPELREFINE8_BITS) {
-		Flags |= QUARTERPELREFINE8_BITS;
-		Flags &= ~PMV_HALFPELREFINE8;
+	if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
+		Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
+		Flags &= ~XVID_ME_HALFPELREFINE8;
 	}
 
-	if (Flags & QUARTERPELREFINE8_BITS)
-		Flags &= ~PMV_QUARTERPELREFINE8;
+	if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
+		Flags &= ~XVID_ME_QUARTERPELREFINE8;
 
-	if (!(VolFlags & XVID_QUARTERPEL))
-		Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);
+	if (!(VolFlags & XVID_VOL_QUARTERPEL))
+		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
 
-	if (!(VopFlags & XVID_HALFPEL))
-		Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);
+	if (!(VopFlags & XVID_VOP_HALFPEL))
+		Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS);
 
-	if ((VopFlags & XVID_GREYSCALE) || (VopFlags & XVID_REDUCED))
-		Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);
+	if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
+		Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
 
 	return Flags;
 }