[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.20,1.21 mencoder.c,1.59,1.60

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv1279

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
-lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias at aerifal.cx>

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cfg-mencoder.h	15 Jan 2002 01:03:22 -0000	1.20
+++ cfg-mencoder.h	17 Jan 2002 01:02:41 -0000	1.21
@@ -51,6 +51,7 @@
 	{"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
 	{"vhq", &lavc_param_vhq, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"vme", &lavc_param_vme, CONF_TYPE_FLAG, CONF_RANGE, 0, 3, NULL},
 	{"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mencoder.c	15 Jan 2002 17:03:18 -0000	1.59
+++ mencoder.c	17 Jan 2002 01:02:41 -0000	1.60
@@ -67,6 +67,7 @@
 char *lavc_param_vcodec = NULL;
 int lavc_param_vbitrate = -1;
 int lavc_param_vhq = 0; /* default is realtime encoding */
+int lavc_param_vme = 3;
 int lavc_param_keyint = -1;
 #endif
 
@@ -904,6 +905,11 @@
     }
     else
 	lavc_venc_context.flags = 0;
+
+    /* motion estimation (0 = none ... 3 = high quality but slow) */
+    /* this is just an extern from libavcodec but it should be in the
+       encoder context - FIXME */
+    motion_estimation_method = lavc_param_vme;
 
 #if 0
     /* fixed qscale :p */