[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.66,1.67

[Diego Biurrun]

Arpi writes:
 > > > Please pardon my ignorance if this is obviously wrong, but why didn't
 > > > you add this to cfg-common.h instead?
 > > 
 > > It really should be there, but config-common.h is rather strange. It
 > > doesn't declare any of the external variables it needs; it assumes
 > > they're already available. And I wasn't sure if it was ok to add
 > > extern stuff to cfg-common.h. If it's really no problem, feel free to
 > > move them.
 > 
 > lol :)
 > 
 > it's even more tricky (ok, call it ugly): the lower half of cfg-common.h
 > contains the extern lines. it's included twice, with a #define changed,
 > first the lower half (externs) are processed, next tiem the upper half
 > (middle part of teh config)t struct).

OK, that helped.  How about this patch:

--- cfg-common.h	27 Jul 2003 22:20:15 -0000	1.101
+++ cfg-common.h	7 Aug 2003 00:42:42 -0000
@@ -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;
--- cfg-mencoder.h	3 Aug 2003 18:59:49 -0000	1.67
+++ cfg-mencoder.h	7 Aug 2003 00:42:42 -0000
@@ -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},
--- cfg-mplayer.h	1 Jul 2003 19:23:08 -0000	1.200
+++ cfg-mplayer.h	7 Aug 2003 00:42:42 -0000
@@ -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