[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.194,1.195 mplayer.c,1.676,1.677

[Filip Kalinski CVS]

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
Forgot about #ifdef HAVE_X11. 10l


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- cfg-mplayer.h	7 Feb 2003 19:38:37 -0000	1.194
+++ cfg-mplayer.h	8 Feb 2003 09:08:11 -0000	1.195
@@ -275,7 +275,6 @@
 	// start in fullscreen mode:
 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-	{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 	// set fullscreen switch method (workaround for buggy WMs)
 	{"fsmode", "option 'fsmode' is obsolete, avoid using it! if you really want it, try -fsmode-dontuse, but don't report bugs with this option used!", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL},
 	{"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
@@ -301,6 +300,7 @@
 	{"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nokeepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 #endif
 
 #ifdef HAVE_XINERAMA

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- mplayer.c	7 Feb 2003 20:01:19 -0000	1.676
+++ mplayer.c	8 Feb 2003 09:08:11 -0000	1.677
@@ -836,11 +836,13 @@
       printf("\n");
       exit(0);
     }
+#ifdef HAVE_X11
     if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
       fstype_help();
       printf("\n");
       exit(0);
     }
+#endif
 
 #ifdef USE_EDL
  {