Mercurial > mplayer.hg
changeset 11922:b2f7ad678181
Duplicate -include option moved to cfg-common.h.
| author | diego |
|---|---|
| date | Thu, 05 Feb 2004 17:08:55 +0000 |
| parents | dd3ac91a86b5 |
| children | e9ab21c4db24 |
| files | cfg-common.h cfg-mencoder.h cfg-mplayer.h |
| diffstat | 3 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Thu Feb 05 15:56:05 2004 +0000 +++ b/cfg-common.h Thu Feb 05 17:08:55 2004 +0000 @@ -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 --------------------
--- a/cfg-mencoder.h Thu Feb 05 15:56:05 2004 +0000 +++ b/cfg-mencoder.h Thu Feb 05 17:08:55 2004 +0000 @@ -162,7 +162,6 @@ 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},
--- a/cfg-mplayer.h Thu Feb 05 15:56:05 2004 +0000 +++ b/cfg-mplayer.h Thu Feb 05 17:08:55 2004 +0000 @@ -173,7 +173,6 @@ 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",