diff options
author | filon <filon@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-08 09:08:11 +0000 |
---|---|---|
committer | filon <filon@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-08 09:08:11 +0000 |
commit | 3dd2496a3eb2f0739e99e04d8692ff729b02a0a4 (patch) | |
tree | 4ef2b22595dca5eebe29c57b88914de7026ce4d4 | |
parent | d5153410a8292c9f4e1d61e44a29a9f7989f7e88 (diff) |
Forgot about #ifdef HAVE_X11. 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9337 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-mplayer.h | 2 | ||||
-rw-r--r-- | mplayer.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index f68a6d7867..d7675c1327 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -275,7 +275,6 @@ static config_t mplayer_opts[]={ // 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 @@ static config_t mplayer_opts[]={ {"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 @@ -836,11 +836,13 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ 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 { |