summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 01:23:09 +0100
committerwm4 <wm4@nowhere>2013-12-17 01:23:09 +0100
commit8d5214de0abc768242aacf8bc217e1726cb6a661 (patch)
tree2fc335b91a33ccf61441f80b6598a32b53c5abe1 /video
parent053c743724e928ca70070f5d43193836851dd91c (diff)
downloadmpv-8d5214de0abc768242aacf8bc217e1726cb6a661.tar.bz2
mpv-8d5214de0abc768242aacf8bc217e1726cb6a661.tar.xz
Move mpvcore/input/ to input/
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.c2
-rw-r--r--video/out/vo_caca.c6
-rw-r--r--video/out/vo_sdl.c6
-rw-r--r--video/out/w32_common.c6
-rw-r--r--video/out/wayland_common.c4
-rw-r--r--video/out/x11_common.c6
6 files changed, 15 insertions, 15 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 0eb04a6d1f..ee746b0376 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -36,7 +36,7 @@
#include "mpvcore/bstr.h"
#include "vo.h"
#include "aspect.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
#include "mpvcore/m_config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index fabf5c7948..89f52a8937 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -40,10 +40,10 @@
#include "video/vfcap.h"
#include "video/memcpy_pic.h"
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
/* caca stuff */
static caca_canvas_t *canvas;
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 384df54b3a..91e6bd9daf 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -30,9 +30,9 @@
#include <SDL.h>
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/options.h"
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 6c5ebe1703..f619a2915c 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -23,14 +23,14 @@
#include <windowsx.h>
#include "mpvcore/options.h"
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_common.h"
#include "vo.h"
#include "aspect.h"
#include "w32_common.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
#include "osdep/io.h"
#include "talloc.h"
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index e18e22c7af..d6be563a33 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -43,8 +43,8 @@
#include "aspect.h"
#include "osdep/timer.h"
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
#define MOD_SHIFT_MASK 0x01
#define MOD_ALT_MASK 0x02
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index e1c67b177a..4187fa21cc 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -26,7 +26,7 @@
#include "mpvcore/bstr.h"
#include "mpvcore/options.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
#include "libavutil/common.h"
#include "x11_common.h"
#include "talloc.h"
@@ -70,8 +70,8 @@
#include <zlib.h>
#endif
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
#define vo_wm_LAYER 1
#define vo_wm_FULLSCREEN 2