diff options
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/aspect.c | 2 | ||||
-rw-r--r-- | video/out/gl_common.c | 4 | ||||
-rw-r--r-- | video/out/gl_lcms.c | 4 | ||||
-rw-r--r-- | video/out/vo.c | 4 | ||||
-rw-r--r-- | video/out/vo.h | 2 | ||||
-rw-r--r-- | video/out/vo_corevideo.c | 2 | ||||
-rw-r--r-- | video/out/vo_direct3d.c | 4 | ||||
-rw-r--r-- | video/out/vo_image.c | 4 | ||||
-rw-r--r-- | video/out/vo_lavc.c | 2 | ||||
-rw-r--r-- | video/out/vo_opengl.c | 2 | ||||
-rw-r--r-- | video/out/vo_opengl_old.c | 2 | ||||
-rw-r--r-- | video/out/vo_sdl.c | 2 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 4 | ||||
-rw-r--r-- | video/out/vo_x11.c | 2 | ||||
-rw-r--r-- | video/out/vo_xv.c | 4 | ||||
-rw-r--r-- | video/out/w32_common.c | 2 | ||||
-rw-r--r-- | video/out/wayland_common.c | 2 | ||||
-rw-r--r-- | video/out/x11_common.c | 2 |
18 files changed, 25 insertions, 25 deletions
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/video/out/w32_common.c @@ -22,7 +22,7 @@ #include <windows.h> #include <windowsx.h> -#include "mpvcore/options.h" +#include "options/options.h" #include "input/keycodes.h" #include "input/input.h" #include "mpvcore/mp_msg.h" diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index d6be563a33..5a078b775e 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -32,7 +32,7 @@ #include "config.h" #include "mpvcore/bstr.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/mp_msg.h" #include "libavutil/common.h" #include "talloc.h" diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 4187fa21cc..adc5ac1b21 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -24,7 +24,7 @@ #include "config.h" #include "mpvcore/bstr.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/mp_msg.h" #include "input/input.h" #include "libavutil/common.h" |