summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-16 00:47:13 +0200
committerwm4 <wm4@nowhere>2014-05-16 00:47:13 +0200
commitebd5bbd241f2b88b99a84fb899d3802e7c9b989d (patch)
treed91103a26d891d89c934b4d436863e7d4c5f10e5 /player
parentb6e675a9bcf05a2c52ce75e057ef522092610611 (diff)
downloadmpv-ebd5bbd241f2b88b99a84fb899d3802e7c9b989d.tar.bz2
mpv-ebd5bbd241f2b88b99a84fb899d3802e7c9b989d.tar.xz
x11: replace--[x11-]fstype option with --x11-netwm
Simplifies the code a lot. You can still use --x11-netwm=no to disable NetWM for whatever reasons.
Diffstat (limited to 'player')
-rw-r--r--player/main.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/player/main.c b/player/main.c
index 8c5e90a0d7..40e2dd8841 100644
--- a/player/main.c
+++ b/player/main.c
@@ -72,10 +72,6 @@
#endif
#endif
-#if HAVE_X11
-#include "video/out/x11_common.h"
-#endif
-
#if HAVE_COCOA
#include "osdep/macosx_application.h"
#endif
@@ -226,13 +222,6 @@ static bool handle_help_options(struct MPContext *mpctx)
talloc_free(list);
opt_exit = 1;
}
-#if HAVE_X11
- if (opts->vo.fstype_list && strcmp(opts->vo.fstype_list[0], "help") == 0) {
- fstype_help(log);
- MP_INFO(mpctx, "\n");
- opt_exit = 1;
- }
-#endif
if ((opts->demuxer_name && strcmp(opts->demuxer_name, "help") == 0) ||
(opts->audio_demuxer_name && strcmp(opts->audio_demuxer_name, "help") == 0) ||
(opts->sub_demuxer_name && strcmp(opts->sub_demuxer_name, "help") == 0)) {