summaryrefslogtreecommitdiffstats
path: root/cfg-mencoder.h
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-28 21:49:40 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-28 21:49:40 +0000
commitf802240b8f9e1b9f2be95920548083bf5db0ca17 (patch)
tree891504faca902a100d2222988416a97bdcd7c6cb /cfg-mencoder.h
parent1162bdf2ef9ce977fabbc6d461d73e78bcc5fb57 (diff)
downloadmpv-f802240b8f9e1b9f2be95920548083bf5db0ca17.tar.bz2
mpv-f802240b8f9e1b9f2be95920548083bf5db0ca17.tar.xz
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> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16618 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
-rw-r--r--cfg-mencoder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index d8a3769fd3..159a5757f2 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -288,7 +288,7 @@ m_option_t mencoder_opts[]={
{"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},