summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer-old.15
-rw-r--r--libvo/x11_common.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/DOCS/man/en/mplayer-old.1 b/DOCS/man/en/mplayer-old.1
index 51f3f938d5..477244cc58 100644
--- a/DOCS/man/en/mplayer-old.1
+++ b/DOCS/man/en/mplayer-old.1
@@ -3345,8 +3345,9 @@ Specify the screen width for video output drivers which
do not know the screen resolution like fbdev, x11 and TV-out.
.
.TP
-.B \-stop\-xscreensaver (X11 only)
-Turns off xscreensaver at startup and turns it on again on exit.
+.B \-(no)stop\-xscreensaver (X11 only)
+Turns off xscreensaver at startup and turns it on again on exit
+(default: enabled).
If your screensaver supports neither the XSS nor XResetScreenSaver
API please use \-heartbeat\-cmd instead.
.
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index edf32792ee..9f580ba47a 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -85,7 +85,7 @@
int fs_layer = WIN_LAYER_ABOVE_DOCK;
-int stop_xscreensaver = 0;
+int stop_xscreensaver = 1;
static int dpms_disabled = 0;