summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
author11rcombs <rodger.combs@gmail.com>2013-12-16 20:35:43 -0600
committerwm4 <wm4@nowhere>2013-12-17 08:44:21 +0100
commitad92c893a0cfed3dbb9eff7a5979c1e43c41c76f (patch)
tree49c1b7e3d71151f50ed2099bddb73a1e792dc4a5 /video
parent0112143fdaae0a6264d9e02355e9dc0ca4f7741c (diff)
downloadmpv-ad92c893a0cfed3dbb9eff7a5979c1e43c41c76f.tar.bz2
mpv-ad92c893a0cfed3dbb9eff7a5979c1e43c41c76f.tar.xz
Fix OSX build; remove all remaining mpvcore references
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa/view.m4
-rw-r--r--video/out/cocoa/window.m2
-rw-r--r--video/out/cocoa_common.m6
3 files changed, 6 insertions, 6 deletions
diff --git a/video/out/cocoa/view.m b/video/out/cocoa/view.m
index b5049e28c9..45f0f17b06 100644
--- a/video/out/cocoa/view.m
+++ b/video/out/cocoa/view.m
@@ -17,8 +17,8 @@
#include <libavutil/common.h>
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
#include "osdep/macosx_compat.h"
#include "video/out/cocoa_common.h"
diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m
index b259af134e..e760fd184d 100644
--- a/video/out/cocoa/window.m
+++ b/video/out/cocoa/window.m
@@ -17,7 +17,7 @@
#include <libavutil/common.h>
-#include "mpvcore/input/keycodes.h"
+#include "input/keycodes.h"
#include "osdep/macosx_application.h"
#include "osdep/macosx_events.h"
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 28f1a044e8..29c06044fe 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -33,14 +33,14 @@
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/out/vo.h"
#include "video/out/aspect.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
#include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
static void vo_cocoa_fullscreen(struct vo *vo);
static void vo_cocoa_ontop(struct vo *vo);