[Mplayer-cvslog] CVS: main cfg-common.h, 1.127, 1.128 cfg-mencoder.h, 1.76, 1.77 cfg-mplayer.h, 1.213, 1.214

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv11629

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
Log Message:
Duplicate -include option moved to cfg-common.h.


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- cfg-common.h	29 Jan 2004 12:01:25 -0000	1.127
+++ cfg-common.h	5 Feb 2004 17:08:55 -0000	1.128
@@ -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 --------------------
 

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- cfg-mencoder.h	29 Jan 2004 12:01:25 -0000	1.76
+++ cfg-mencoder.h	5 Feb 2004 17:08:55 -0000	1.77
@@ -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},
 

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- cfg-mplayer.h	29 Jan 2004 12:01:25 -0000	1.213
+++ cfg-mplayer.h	5 Feb 2004 17:08:55 -0000	1.214
@@ -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",