diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-05 17:08:55 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-05 17:08:55 +0000 |
| commit | e4b10f79fd86d1d562bd2984c3226513863bc9a3 (patch) | |
| tree | b62799c8d253fe80fdde418509202dd5e412d22c | |
| parent | 9094281ecf4ce6471a722cd1f580e2f5392ecaf2 (diff) | |
| download | mpv-e4b10f79fd86d1d562bd2984c3226513863bc9a3.tar.bz2 mpv-e4b10f79fd86d1d562bd2984c3226513863bc9a3.tar.xz | |
Duplicate -include option moved to cfg-common.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11923 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-common.h | 3 | ||||
| -rw-r--r-- | cfg-mencoder.h | 1 | ||||
| -rw-r--r-- | cfg-mplayer.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cfg-common.h b/cfg-common.h index 0ef98d971c..b5da7f68a5 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -1,10 +1,11 @@ #ifdef MAIN_CONF /* this will be included in conf[] */ -// ------------------------- common optionss -------------------- +// ------------------------- common options -------------------- {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, + {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, // ------------------------- stream options -------------------- diff --git a/cfg-mencoder.h b/cfg-mencoder.h index d542407535..9e1a50d33c 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -162,7 +162,6 @@ m_option_t of_conf[]={ m_option_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */ {"endpos", parse_end_at, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 25171f97f5..c25bbeef17 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -173,7 +173,6 @@ extern char* pp_help; m_option_t mplayer_opts[]={ /* name, pointer, type, flags, min, max */ - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this don't need anymore to be the first!!! */ //---------------------- libao/libvo options ------------------------ {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", |