Mercurial > mplayer.hg

changeset 9336:4d39aa85a723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Forgot about #ifdef HAVE_X11. 10l
author filon
date Sat, 08 Feb 2003 09:08:11 +0000
parents de287fe94511
children 452566dd7f53
files cfg-mplayer.h mplayer.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Sat Feb 08 09:07:13 2003 +0000
+++ b/cfg-mplayer.h	Sat Feb 08 09:08:11 2003 +0000
@@ -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
--- a/mplayer.c	Sat Feb 08 09:07:13 2003 +0000
+++ b/mplayer.c	Sat Feb 08 09:08:11 2003 +0000
@@ -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
  {