summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
Diffstat (limited to 'video/out')
-rw-r--r--video/out/aspect.c4
-rw-r--r--video/out/bitmap_packer.c4
-rw-r--r--video/out/cocoa_common.m6
-rw-r--r--video/out/gl_common.c4
-rw-r--r--video/out/gl_common.h4
-rw-r--r--video/out/gl_lcms.c8
-rw-r--r--video/out/gl_video.c2
-rw-r--r--video/out/vo.c12
-rw-r--r--video/out/vo.h4
-rw-r--r--video/out/vo_caca.c8
-rw-r--r--video/out/vo_corevideo.c2
-rw-r--r--video/out/vo_direct3d.c6
-rw-r--r--video/out/vo_image.c8
-rw-r--r--video/out/vo_lavc.c6
-rw-r--r--video/out/vo_null.c2
-rw-r--r--video/out/vo_opengl.c8
-rw-r--r--video/out/vo_opengl_old.c4
-rw-r--r--video/out/vo_sdl.c10
-rw-r--r--video/out/vo_vdpau.c6
-rw-r--r--video/out/vo_x11.c4
-rw-r--r--video/out/vo_xv.c6
-rw-r--r--video/out/w32_common.c12
-rw-r--r--video/out/wayland_common.c10
-rw-r--r--video/out/x11_common.c12
24 files changed, 76 insertions, 76 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 2697d97e97..aa2e6e64d8 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -21,8 +21,8 @@
/* Stuff for correct aspect scaling. */
#include "aspect.h"
#include "vo.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "vo.h"
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index 4fd6594a35..ff76e70315 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -26,8 +26,8 @@
#include "talloc.h"
#include "bitmap_packer.h"
-#include "core/mp_msg.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
#include "sub/dec_sub.h"
#include "video/memcpy_pic.h"
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index f50d8af291..94673d5e94 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -27,14 +27,14 @@
#include "config.h"
-#include "core/options.h"
+#include "mpvcore/options.h"
#include "vo.h"
#include "aspect.h"
-#include "core/input/input.h"
+#include "mpvcore/input/input.h"
#include "talloc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "osdep/macosx_application.h"
#include "osdep/macosx_events.h"
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 7c4bfd3056..589491f2d7 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -42,8 +42,8 @@
#include <assert.h>
#include "talloc.h"
#include "gl_common.h"
-#include "core/options.h"
-#include "core/m_option.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_option.h"
#include "sub/sub.h"
#include "bitmap_packer.h"
diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index e6ceabff74..3e3bb8a8e8 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -29,8 +29,8 @@
#include <stdbool.h>
#include "config.h"
-#include "core/mp_msg.h"
-#include "core/bstr.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/bstr.h"
#include "vo.h"
#include "video/csputils.h"
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index fdab119fb1..6bda41cfe4 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -27,10 +27,10 @@
#include "config.h"
#include "stream/stream.h"
-#include "core/mp_common.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
#include "gl_video.h"
#include "gl_lcms.h"
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 0706d65b19..6fb41e5814 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -30,7 +30,7 @@
#include "gl_video.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
#include "gl_common.h"
#include "gl_osd.h"
#include "filter_kernels.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index 3a0c1d060d..32803a0a23 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -32,14 +32,14 @@
#include "config.h"
#include "osdep/timer.h"
-#include "core/options.h"
-#include "core/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/bstr.h"
#include "vo.h"
#include "aspect.h"
-#include "core/input/input.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
-#include "core/mpv_global.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mpv_global.h"
#include "video/mp_image.h"
#include "video/vfcap.h"
#include "sub/sub.h"
diff --git a/video/out/vo.h b/video/out/vo.h
index 1a57ad2a25..4052d11773 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -27,8 +27,8 @@
#include <stdbool.h>
#include "video/img_format.h"
-#include "core/mp_common.h"
-#include "core/options.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/options.h"
#define VO_EVENT_EXPOSE 1
#define VO_EVENT_RESIZE 2
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index a14441e4f4..b217eb8f29 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 "core/input/keycodes.h"
-#include "core/input/input.h"
-#include "core/mp_msg.h"
-#include "core/input/input.h"
+#include "mpvcore/input/keycodes.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/input/input.h"
/* caca stuff */
static caca_canvas_t *canvas;
diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c
index 77511b2b0b..2bc5e9b2dd 100644
--- a/video/out/vo_corevideo.c
+++ b/video/out/vo_corevideo.c
@@ -25,7 +25,7 @@
#include "talloc.h"
#include "video/out/vo.h"
#include "sub/sub.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "video/csputils.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index cc8b4d67f8..9a3e70b1cd 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -28,8 +28,8 @@
#include <d3d9.h>
#include <inttypes.h>
#include "config.h"
-#include "core/options.h"
-#include "core/m_option.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_option.h"
#include "talloc.h"
#include "vo.h"
#include "video/vfcap.h"
@@ -37,7 +37,7 @@
#include "video/mp_image.h"
#include "video/img_format.h"
#include "video/memcpy_pic.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "w32_common.h"
#include "libavutil/common.h"
#include "sub/sub.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index 03869146f7..248cddc78a 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -25,11 +25,11 @@
#include <libswscale/swscale.h>
#include "config.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
#include "osdep/io.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
#include "talloc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "video/out/vo.h"
#include "video/csputils.h"
#include "video/vfcap.h"
@@ -38,7 +38,7 @@
#include "video/image_writer.h"
#include "video/sws_utils.h"
#include "sub/sub.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
struct priv {
struct image_writer_opts *opts;
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index 7ee372f053..2a4a7d9969 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -23,15 +23,15 @@
#include <stdio.h>
#include <stdlib.h>
#include "compat/libav.h"
-#include "core/mp_common.h"
-#include "core/options.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/options.h"
#include "video/fmt-conversion.h"
#include "video/mp_image.h"
#include "video/vfcap.h"
#include "talloc.h"
#include "vo.h"
-#include "core/encode_lavc.h"
+#include "mpvcore/encode_lavc.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
diff --git a/video/out/vo_null.c b/video/out/vo_null.c
index 88c355033f..9927a0a53d 100644
--- a/video/out/vo_null.c
+++ b/video/out/vo_null.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <errno.h>
#include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 10e7fdf527..a6950c8d11 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -33,10 +33,10 @@
#include "config.h"
#include "talloc.h"
-#include "core/mp_common.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
-#include "core/m_config.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_config.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c
index 1e8fba6495..008dc2d2a6 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -31,8 +31,8 @@
#include "config.h"
#include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 6b8b393984..64f1a856b9 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -30,11 +30,11 @@
#include <SDL.h>
-#include "core/input/input.h"
-#include "core/input/keycodes.h"
-#include "core/input/input.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/input/keycodes.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 57d747dc4b..588a1ceac5 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -37,14 +37,14 @@
#include "config.h"
#include "video/vdpau.h"
#include "video/decode/dec_video.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "talloc.h"
#include "vo.h"
#include "x11_common.h"
#include "video/csputils.h"
#include "sub/sub.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index e5def2fc9a..e5b9053fe3 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -49,8 +49,8 @@
#include "video/sws_utils.h"
#include "video/fmt-conversion.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "osdep/timer.h"
extern int sws_flags;
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index b7e3687ef7..7cc7b8420d 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -41,9 +41,9 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#include "core/options.h"
+#include "mpvcore/options.h"
#include "talloc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
@@ -53,7 +53,7 @@
#include "sub/sub.h"
#include "sub/draw_bmp.h"
#include "video/csputils.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "osdep/timer.h"
static const vo_info_t info = {
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 4515c9bda7..b06f1e0aa3 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -22,15 +22,15 @@
#include <windows.h>
#include <windowsx.h>
-#include "core/options.h"
-#include "core/input/keycodes.h"
-#include "core/input/input.h"
-#include "core/mp_msg.h"
-#include "core/mp_common.h"
+#include "mpvcore/options.h"
+#include "mpvcore/input/keycodes.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
#include "vo.h"
#include "aspect.h"
#include "w32_common.h"
-#include "core/input/input.h"
+#include "mpvcore/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 9a35232183..fd74601df4 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -33,9 +33,9 @@
#include <linux/input.h>
#include "config.h"
-#include "core/bstr.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
#include "libavutil/common.h"
#include "talloc.h"
@@ -45,8 +45,8 @@
#include "aspect.h"
#include "osdep/timer.h"
-#include "core/input/input.h"
-#include "core/input/keycodes.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/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 23ed91ba73..2e28b8c423 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -23,10 +23,10 @@
#include <limits.h>
#include "config.h"
-#include "core/bstr.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
-#include "core/input/input.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/input/input.h"
#include "libavutil/common.h"
#include "x11_common.h"
#include "talloc.h"
@@ -66,8 +66,8 @@
#include <X11/XF86keysym.h>
#endif
-#include "core/input/input.h"
-#include "core/input/keycodes.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/input/keycodes.h"
#define vo_wm_LAYER 1
#define vo_wm_FULLSCREEN 2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 09:15:32 +0000