--- branches/dev-api-4/xvidcore/src/divx4.c	2003/03/26 11:01:03	948
+++ branches/dev-api-4/xvidcore/src/divx4.c	2003/03/26 14:56:49	949
@@ -38,7 +38,7 @@
  *  22.12.2001  removed some compiler warnings
  *  16.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: divx4.c,v 1.21 2003-02-15 15:22:17 edgomez Exp $
+ *  $Id: divx4.c,v 1.21.2.1 2003-03-26 14:56:09 edgomez Exp $
  *
  *************************************************************************/
 
@@ -108,15 +108,15 @@
 
 	0,
 
-	PMV_ADVANCEDDIAMOND16,
+	XVID_ME_ADVANCEDDIAMOND16,
 
-	PMV_HALFPELREFINE16,
+	XVID_ME_HALFPELREFINE16,
 
-	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
+	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,
 
-	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
+	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,
 
-	PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 |	PMV_HALFPELREFINE8
+	XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |	XVID_ME_HALFPELREFINE8
 };
 
 
@@ -125,10 +125,10 @@
 	0,
 	XVID_H263QUANT,
 	XVID_H263QUANT,
-	XVID_H263QUANT | XVID_HALFPEL,
-	XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL,
-	XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL,
-	XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL
+	XVID_H263QUANT | XVID_VOP_HALFPEL,
+	XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL,
+	XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL,
+	XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL
 };
 
 /**************************************************************************