[Mplayer-cvslog] CVS: main cfg-common.h, 1.126, 1.127 cfg-mencoder.h, 1.75, 1.76 cfg-mplayer.h, 1.212, 1.213 mencoder.c, 1.231, 1.232 mplayer.c, 1.744, 1.745

[Diego Biurrun]

Diego Biurrun writes:
 > 2) The -input option is also duplicated in cfg-mplayer.h and
 >    cfg-mencoder.h instead of cfg-common.h.

I made this trivial patch, it works for me (tested with MPlayer only,
though).  If nobody objects, I'll apply it tomorrow.

Diego

--- cfg-common.h	29 Jan 2004 12:01:25 -0000	1.127
+++ cfg-common.h	2 Feb 2004 23:57:07 -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 --------------------
 
--- cfg-mencoder.h	29 Jan 2004 12:01:25 -0000	1.76
+++ cfg-mencoder.h	2 Feb 2004 23:57:07 -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},
 
--- cfg-mplayer.h	29 Jan 2004 12:01:25 -0000	1.213
+++ cfg-mplayer.h	2 Feb 2004 23:57:07 -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",