Merge branch 'master' into release/0.9

* master: (87 commits)
  manpage: move --autosync description
  player: add --window-scale option
  player: flush decoder even if cover art is decoded
  player: don't show A/V desync message in non-sense situations
  w32_common: add more rounded-down frame rates
  w32_common: use the current monitor's refresh rate
  dxva2: fix broken build with gcc 5.1
  terminal: printf() is not signal-safe
  man: fix PDF build
  DOCS/mplayer-changes: Eleborate on joystick input
  osc: add nil check for element.eventresponder
  mp_image: remove some unused interlacing flags
  vf_vapoursynth: update _FieldBased semantics
  options: remove unneeded hack from command line parser
  manpage: document ff-index sub-property
  demux_mkv: limit timestamp fixing to 1ms max
  demux_mkv: attempt to fix rounded timestamps
  demux_mkv: move global options to the demuxer
  demux_mkv: better seeking after video end
  lua: add utils.format_json() function
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index f6d73dae00..eeff773bef 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -20,9 +20,12 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <pthread.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "osdep/semaphore.h"
+
 #include "common/common.h"
 
 struct vo;
@@ -57,6 +60,9 @@ struct vo_x11_state {
     bool screensaver_enabled;
     bool dpms_touched;
     double screensaver_time_last;
+    pthread_t screensaver_thread;
+    sem_t screensaver_sem;
+    struct mp_cancel *screensaver_terminate;
 
     XIM xim;
     XIC xic;