--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/07/10 17:41:48	1081
+++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/08/04 17:22:36	1110
@@ -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: xvid_encraw.c,v 1.11.2.29 2003-07-10 17:39:40 edgomez Exp $
+ * $Id: xvid_encraw.c,v 1.11.2.31 2003-08-04 17:22:36 chl Exp $
  *
  ****************************************************************************/
 
@@ -55,39 +55,40 @@
 /*****************************************************************************
  *                            Quality presets
  ****************************************************************************/
-static xvid_motion_t const motion_presets[] = {
+
+static const int motion_presets[] = {
 	/* quality 0 */
-	0,
+	XVID_ME_GME_REFINE,
 
 	/* quality 1 */
-	XVID_ME_ADVANCEDDIAMOND16,
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16,
 
 	/* quality 2 */
-	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16,
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16,
 
 	/* quality 3 */
-	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8,
 
 	/* quality 4 */
-	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 	/* quality 5 */
-	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 	/* quality 6 */
-	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
+	XVID_ME_GME_REFINE | XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8 ,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 };
 #define ME_ELEMENTS (sizeof(motion_presets)/sizeof(motion_presets[0]))
 
-static xvid_vop_t const vop_presets[] = {
+static const int vop_presets[] = {
 	/* quality 0 */
 	0,
 
@@ -1064,7 +1065,7 @@
 	}
 
 	/* Set up core's general features */
-	xvid_enc_frame.vol_flags = 0;
+	xvid_enc_frame.vol_flags = XVID_VOL_GMC;
 	if (ARG_STATS)
 		xvid_enc_frame.vol_flags |= XVID_VOL_EXTRASTATS;