summaryrefslogtreecommitdiffstats
path: root/cfg-mencoder.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-14 23:55:51 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-14 23:55:51 +0000
commitafd9de3d713557cfc582ee21efe10f2054e962a2 (patch)
tree55856bc800ff29f9e605a0658b355eda6736a8fc /cfg-mencoder.h
parent8114d1badf26e89c31b13aa3bc4c368e512894fe (diff)
downloadmpv-afd9de3d713557cfc582ee21efe10f2054e962a2.tar.bz2
mpv-afd9de3d713557cfc582ee21efe10f2054e962a2.tar.xz
GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4159 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
-rw-r--r--cfg-mencoder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 9f64a55a97..98a31b9a4d 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -85,9 +85,9 @@ struct config oac_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-struct config mencoder_opts[]={
+static config_t mplayer_opts[]={
/* name, pointer, type, flags, min, max */
- {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, /* this must be the first!!! */
+ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */
{"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
{"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -126,8 +126,8 @@ struct config mencoder_opts[]={
#undef MAIN_CONF
// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
- {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, NULL},
+ {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
+ {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL},
// {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
// {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
// {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},