summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:02:25 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:07:57 +0100
commiteb15151705d47d23da844449126cc6b4879f110e (patch)
tree661866ee9e73bc893c7963660aae01db503e99aa /video
parent793f85945fc07db905e54390c065ae51b9eeef9b (diff)
downloadmpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2
mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz
Move options/config related files from mpvcore/ to options/
Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c2
-rw-r--r--video/decode/vd_lavc.c4
-rw-r--r--video/filter/vf.c6
-rw-r--r--video/filter/vf_crop.c4
-rw-r--r--video/filter/vf_delogo.c2
-rw-r--r--video/filter/vf_divtc.c2
-rw-r--r--video/filter/vf_dlopen.c2
-rw-r--r--video/filter/vf_dsize.c2
-rw-r--r--video/filter/vf_eq.c2
-rw-r--r--video/filter/vf_expand.c4
-rw-r--r--video/filter/vf_format.c2
-rw-r--r--video/filter/vf_gradfun.c2
-rw-r--r--video/filter/vf_hqdn3d.c2
-rw-r--r--video/filter/vf_ilpack.c2
-rw-r--r--video/filter/vf_lavfi.c2
-rw-r--r--video/filter/vf_lavfi.h2
-rw-r--r--video/filter/vf_noformat.c2
-rw-r--r--video/filter/vf_noise.c2
-rw-r--r--video/filter/vf_phase.c2
-rw-r--r--video/filter/vf_pp.c2
-rw-r--r--video/filter/vf_pullup.c2
-rw-r--r--video/filter/vf_rotate.c2
-rw-r--r--video/filter/vf_scale.c4
-rw-r--r--video/filter/vf_stereo3d.c4
-rw-r--r--video/filter/vf_sub.c4
-rw-r--r--video/filter/vf_unsharp.c2
-rw-r--r--video/filter/vf_vavpp.c2
-rw-r--r--video/filter/vf_yadif.c2
-rw-r--r--video/image_writer.c2
-rw-r--r--video/out/aspect.c2
-rw-r--r--video/out/gl_common.c4
-rw-r--r--video/out/gl_lcms.c4
-rw-r--r--video/out/vo.c4
-rw-r--r--video/out/vo.h2
-rw-r--r--video/out/vo_corevideo.c2
-rw-r--r--video/out/vo_direct3d.c4
-rw-r--r--video/out/vo_image.c4
-rw-r--r--video/out/vo_lavc.c2
-rw-r--r--video/out/vo_opengl.c2
-rw-r--r--video/out/vo_opengl_old.c2
-rw-r--r--video/out/vo_sdl.c2
-rw-r--r--video/out/vo_vdpau.c4
-rw-r--r--video/out/vo_x11.c2
-rw-r--r--video/out/vo_xv.c4
-rw-r--r--video/out/w32_common.c2
-rw-r--r--video/out/wayland_common.c2
-rw-r--r--video/out/x11_common.c2
47 files changed, 62 insertions, 62 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index a77e77ec6d..06b00be84f 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,7 +17,7 @@
*/
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 7e24cbcd90..506481cf1c 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -33,7 +33,7 @@
#include "talloc.h"
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "mpvcore/av_opts.h"
#include "mpvcore/av_common.h"
@@ -57,7 +57,7 @@
#error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE
#endif
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static void init_avctx(struct dec_video *vd, const char *decoder,
struct vd_lavc_hwdec *hwdec);
diff --git a/video/filter/vf.c b/video/filter/vf.c
index c1e9084b0d..4143a835b1 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -27,10 +27,10 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index fffcc62921..dde297f910 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -22,13 +22,13 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static const struct vf_priv_s {
int crop_w,crop_h;
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index 3ec6755f03..0c80bec057 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -36,7 +36,7 @@
#include "vf_lavfi.h"
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
//===========================================================================//
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index c471d4a774..6c8574039d 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "libavutil/common.h"
#include "compat/mpbswap.h"
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 5bf8198ce7..4b7551167b 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "vf_dlopen.h"
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index 9aa5f719ad..ed4d3ef871 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c
index e423b301ff..542627cb3b 100644
--- a/video/filter/vf_eq.c
+++ b/video/filter/vf_eq.c
@@ -32,7 +32,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 2e72f6bff7..fe4b8baccb 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -33,7 +33,7 @@
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
// These four values are a backup of the values parsed from the command line.
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index e673fd8f60..bdbefec542 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int fmt;
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index 7c9a0ecab3..ea3b615caa 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -43,7 +43,7 @@
#include "video/memcpy_pic.h"
#include "compat/x86_cpu.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "vf_lavfi.h"
diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
index 1a5736f98e..07cea5ad28 100644
--- a/video/filter/vf_hqdn3d.c
+++ b/video/filter/vf_hqdn3d.c
@@ -25,7 +25,7 @@
#include <math.h>
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index bd7e863dee..d79f557652 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c
index 47701ed1f9..98216c08e4 100644
--- a/video/filter/vf_lavfi.c
+++ b/video/filter/vf_lavfi.c
@@ -37,7 +37,7 @@
#include <libavfilter/buffersrc.h>
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#include "video/img_format.h"
diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h
index 45765d9dea..aef8a93448 100644
--- a/video/filter/vf_lavfi.h
+++ b/video/filter/vf_lavfi.h
@@ -37,7 +37,7 @@ static void vf_lw_set_recreate_cb(struct vf_instance *vf,
void (*recreate)(struct vf_instance *vf))
{
}
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static const struct m_sub_options vf_lw_conf = {0};
#endif
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index f3b193bc4e..50f9f7f26f 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int fmt;
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 8525b06dc2..0f20cfc353 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index c439a2466a..2a8b9dfc61 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index dff8b2b3ec..c49ed218b5 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 36fac55cc5..a0d2c7da26 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index 0105cb2c1d..bbb02647d1 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 268e65ae59..c80113f6fd 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -39,7 +39,7 @@
#include "video/csputils.h"
#include "video/out/vo.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int w, h;
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index 6bd13ada87..b9d97756fe 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -25,12 +25,12 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "libavutil/common.h"
#include "video/memcpy_pic.h"
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index bd2ab88fd0..e9f056e113 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -40,7 +40,7 @@
#include "video/sws_utils.h"
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
struct vf_priv_s {
int opt_top_margin, opt_bottom_margin;
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index 1cab2ada0c..582449ad53 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index dfd99e8a3c..6c96ae1bda 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -19,7 +19,7 @@
#include <va/va_vpp.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "vf.h"
#include "video/vaapi.h"
#include "video/hwdec.h"
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index 7cbfb1633c..46e59bf741 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "video/img_format.h"
diff --git a/video/image_writer.c b/video/image_writer.c
index d2ef348d87..98a691d51d 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -40,7 +40,7 @@
#include "video/fmt-conversion.h"
#include "video/sws_utils.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
const struct image_writer_opts image_writer_opts_defaults = {
.format = "jpg",
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 3a45367afb..33cf5ebfef 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -22,7 +22,7 @@
#include "aspect.h"
#include "vo.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "vo.h"
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 20674de317..f31ecdb64e 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 "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
//! \defgroup glgeneral OpenGL general helper functions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index 49a3a0346c..919ab2e657 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -30,8 +30,8 @@
#include "mpvcore/mp_common.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
#include "gl_video.h"
#include "gl_lcms.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index ee746b0376..ab8a92fd9e 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -32,12 +32,12 @@
#include "config.h"
#include "osdep/timer.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "vo.h"
#include "aspect.h"
#include "input/input.h"
-#include "mpvcore/m_config.h"
+#include "options/m_config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
#include "video/mp_image.h"
diff --git a/video/out/vo.h b/video/out/vo.h
index d9058b96e9..2c9eec4849 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -28,7 +28,7 @@
#include "video/img_format.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#define VO_EVENT_EXPOSE 1
#define VO_EVENT_RESIZE 2
diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c
index 9b415de191..2a154b99f0 100644
--- a/video/out/vo_corevideo.c
+++ b/video/out/vo_corevideo.c
@@ -32,7 +32,7 @@
#include "talloc.h"
#include "video/out/vo.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/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 06d91e4e18..52627d3d32 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 "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
#include "talloc.h"
#include "vo.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index fd694e77dd..b08f3018b0 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/bstr.h"
#include "osdep/io.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "video/out/vo.h"
@@ -38,7 +38,7 @@
#include "video/image_writer.h"
#include "video/sws_utils.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/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 2da3f06a3c..81a4280def 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include "compat/libav.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/fmt-conversion.h"
#include "video/mp_image.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 714bbf4e6b..d1e0f3d2f0 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -38,7 +38,7 @@
#include "mpvcore/mp_common.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_config.h"
+#include "options/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 5ae8816900..9e39a6197c 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -34,7 +34,7 @@
#include "config.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/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 91e6bd9daf..574b453a6f 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -34,7 +34,7 @@
#include "input/keycodes.h"
#include "input/input.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 082ad1a05d..1343b54b65 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -38,13 +38,13 @@
#include "video/vdpau.h"
#include "video/hwdec.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "talloc.h"
#include "vo.h"
#include "x11_common.h"
#include "video/csputils.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/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 513f63aa10..ead41c51c8 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -53,7 +53,7 @@
#include "video/fmt-conversion.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/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 00d5217219..1fa4323beb 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -43,7 +43,7 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "vo.h"
@@ -55,7 +55,7 @@
#include "sub/osd.h"
#include "sub/draw_bmp.h"
#include "video/csputils.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#define CK_METHOD_NONE 0 // no colorkey drawing
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index f619a2915c..b8fe0309af 100644
--- a/video/out/w32_common.c
+++ b/