[Mplayer-cvslog] CVS: main cfg-common.h,1.104,1.105 cfg-mencoder.h,1.67,1.68 cfg-mplayer.h,1.200,1.201

[Diego Biurrun CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv16620

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
Log Message:
Moved -slices to cfg-common.h.


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- cfg-common.h	11 Aug 2003 00:02:21 -0000	1.104
+++ cfg-common.h	11 Aug 2003 01:38:50 -0000	1.105
@@ -183,6 +183,10 @@
         {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
 	{"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL},
 
+	// draw by slices or whole frame (useful with libmpeg2/libavcodec)
+	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+
 #ifdef USE_LIBAVCODEC
 	{"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
@@ -244,6 +248,7 @@
 extern float movie_aspect;
 extern int softzoom;
 extern int flip;
+extern int vd_use_slices;
 
 /* from dec_audio, currently used for ac3surround decoder only */
 extern int audio_output_channels;

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- cfg-mencoder.h	3 Aug 2003 18:59:49 -0000	1.67
+++ cfg-mencoder.h	11 Aug 2003 01:38:50 -0000	1.68
@@ -147,8 +147,6 @@
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern int vd_use_slices;
-
 static config_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!!! */
@@ -188,10 +186,6 @@
 	{"vobsubout", &vobsub_out, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
 	{"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL},
-
-	// draw by slices or whole frame (usefull with libmpeg2/libavcodec)
-	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 	{"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL},

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- cfg-mplayer.h	1 Jul 2003 19:23:08 -0000	1.200
+++ cfg-mplayer.h	11 Aug 2003 01:38:50 -0000	1.201
@@ -56,7 +56,6 @@
 extern int vo_fsmode;
 extern int vo_dbpp;
 extern int vo_directrendering;
-extern int vd_use_slices;
 extern float vo_panscan;
 /* only used by startup (setting these values from configfile) */
 extern int vo_gamma_brightness;
@@ -308,10 +307,6 @@
 	{"nodr", &vo_directrendering, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-
-	// draw by slices or whole frame (usefull with libmpeg2/libavcodec)
-	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 #ifdef HAVE_AA
 	// -vo aa