[MPlayer-cvslog] CVS: main cfg-mencoder.h,1.103,1.104

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv26087

Modified Files:
	cfg-mencoder.h 
Log Message:
A long-standing bug...  -vfwopts in cfg-mencoder.h is being overridden
by -vf* in cfg-common.h.  The easiest fix of all, add an 'x' to the
name:  -xvfwopts
patch by RC <rcooley -- at -- spamcop -- dot -- net>


Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- cfg-mencoder.h	19 Sep 2005 19:23:38 -0000	1.103
+++ cfg-mencoder.h	28 Sep 2005 21:49:40 -0000	1.104
@@ -288,7 +288,7 @@
 	{"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef USE_WIN32DLL
-	{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+	{"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},