diff options
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/gl_common.c | 2 | ||||
-rw-r--r-- | video/out/gl_osd.h | 2 | ||||
-rw-r--r-- | video/out/gl_video.h | 2 | ||||
-rw-r--r-- | video/out/vo.c | 2 | ||||
-rw-r--r-- | video/out/vo_corevideo.c | 2 | ||||
-rw-r--r-- | video/out/vo_direct3d.c | 2 | ||||
-rw-r--r-- | video/out/vo_image.c | 2 | ||||
-rw-r--r-- | video/out/vo_lavc.c | 3 | ||||
-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_vaapi.c | 2 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 2 | ||||
-rw-r--r-- | video/out/vo_wayland.c | 2 | ||||
-rw-r--r-- | video/out/vo_x11.c | 2 | ||||
-rw-r--r-- | video/out/vo_xv.c | 2 |
16 files changed, 15 insertions, 18 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index a3ed6d626d..8ab2c8ec10 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -44,8 +44,6 @@ #include "gl_common.h" #include "mpvcore/options.h" #include "mpvcore/m_option.h" -#include "sub/sub.h" -#include "bitmap_packer.h" //! \defgroup glgeneral OpenGL general helper functions diff --git a/video/out/gl_osd.h b/video/out/gl_osd.h index 29b4584a4a..445766d19a 100644 --- a/video/out/gl_osd.h +++ b/video/out/gl_osd.h @@ -5,7 +5,7 @@ #include <inttypes.h> #include "gl_common.h" -#include "sub/sub.h" +#include "sub/osd.h" struct mpgl_osd_part { enum sub_bitmap_format format; diff --git a/video/out/gl_video.h b/video/out/gl_video.h index cab5f0f077..27da29461c 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -19,7 +19,7 @@ #include <stdbool.h> -#include "sub/sub.h" +#include "sub/osd.h" #include "gl_common.h" struct lut3d { diff --git a/video/out/vo.c b/video/out/vo.c index 737c9c34f9..9fc4db1418 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -42,7 +42,7 @@ #include "mpvcore/mpv_global.h" #include "video/mp_image.h" #include "video/vfcap.h" -#include "sub/sub.h" +#include "sub/osd.h" // // Externally visible list of all vo drivers diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c index 7b34a91924..9b415de191 100644 --- a/video/out/vo_corevideo.c +++ b/video/out/vo_corevideo.c @@ -31,7 +31,7 @@ #include "talloc.h" #include "video/out/vo.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "mpvcore/m_option.h" #include "video/csputils.h" diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index cd440f89f6..06d91e4e18 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -40,7 +40,7 @@ #include "mpvcore/mp_msg.h" #include "w32_common.h" #include "libavutil/common.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "bitmap_packer.h" // shaders generated by fxc.exe from d3d_shader_yuv.hlsl diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 64619a47d6..6fcf77e5d6 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -37,7 +37,7 @@ #include "video/fmt-conversion.h" #include "video/image_writer.h" #include "video/sws_utils.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "mpvcore/m_option.h" struct priv { diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index b1416b7fe3..0080126c7d 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -33,8 +33,7 @@ #include "mpvcore/encode_lavc.h" -#include "sub/sub.h" -#include "sub/dec_sub.h" +#include "sub/osd.h" struct priv { uint8_t *buffer; diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 71a5092288..e086e36e7d 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -42,7 +42,7 @@ #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "gl_common.h" #include "gl_osd.h" diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index 310583a8ed..3c11f3cac2 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -38,7 +38,7 @@ #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "gl_common.h" #include "gl_osd.h" diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 60498e2847..6fe62b187b 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -38,7 +38,7 @@ #include "osdep/timer.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "video/mp_image.h" #include "video/vfcap.h" diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index 83528a2100..df9ff2ce5d 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -32,7 +32,7 @@ #include "mpvcore/mp_msg.h" #include "video/out/vo.h" #include "video/memcpy_pic.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "sub/img_convert.h" #include "x11_common.h" diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index e1816b1595..54b13cfd94 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -43,7 +43,7 @@ #include "vo.h" #include "x11_common.h" #include "video/csputils.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "mpvcore/m_option.h" #include "video/vfcap.h" #include "video/mp_image.h" diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index b1f99bd26f..293b3081eb 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -30,7 +30,7 @@ #include "config.h" #include "vo.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "video/vfcap.h" #include "video/mp_image.h" #include "mpvcore/mp_msg.h" diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index be385ac621..513f63aa10 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -46,7 +46,7 @@ #include <X11/extensions/XShm.h> #endif -#include "sub/sub.h" +#include "sub/osd.h" #include "sub/draw_bmp.h" #include "video/sws_utils.h" diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index a64dd1202a..b86f0e5f6b 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -52,7 +52,7 @@ #include "video/img_fourcc.h" #include "x11_common.h" #include "video/memcpy_pic.h" -#include "sub/sub.h" +#include "sub/osd.h" #include "sub/draw_bmp.h" #include "video/csputils.h" #include "mpvcore/m_option.h" |