From 0112143fdaae0a6264d9e02355e9dc0ca4f7741c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 02:39:45 +0100 Subject: Split mpvcore/ into common/, misc/, bstr/ --- video/out/aspect.c | 2 +- video/out/bitmap_packer.c | 4 ++-- video/out/gl_common.h | 4 ++-- video/out/gl_lcms.c | 6 +++--- video/out/gl_video.c | 2 +- video/out/vo.c | 6 +++--- video/out/vo.h | 2 +- video/out/vo_caca.c | 2 +- video/out/vo_direct3d.c | 2 +- video/out/vo_image.c | 4 ++-- video/out/vo_lavc.c | 4 ++-- video/out/vo_null.c | 2 +- video/out/vo_opengl.c | 6 +++--- video/out/vo_opengl_old.c | 2 +- video/out/vo_sdl.c | 2 +- video/out/vo_vaapi.c | 2 +- video/out/vo_vdpau.c | 2 +- video/out/vo_wayland.c | 2 +- video/out/vo_x11.c | 2 +- video/out/vo_xv.c | 2 +- video/out/w32_common.c | 4 ++-- video/out/wayland_common.c | 4 ++-- video/out/x11_common.c | 4 ++-- 23 files changed, 36 insertions(+), 36 deletions(-) (limited to 'video/out') diff --git a/video/out/aspect.c b/video/out/aspect.c index 33cf5ebfef..e7167dacde 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -21,7 +21,7 @@ /* Stuff for correct aspect scaling. */ #include "aspect.h" #include "vo.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "vo.h" diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index ff76e70315..35e4f4c176 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 "mpvcore/mp_msg.h" -#include "mpvcore/mp_common.h" +#include "common/msg.h" +#include "common/common.h" #include "sub/dec_sub.h" #include "video/memcpy_pic.h" diff --git a/video/out/gl_common.h b/video/out/gl_common.h index f9d4685a6b..45ff9a0110 100644 --- a/video/out/gl_common.h +++ b/video/out/gl_common.h @@ -29,8 +29,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/bstr.h" +#include "common/msg.h" +#include "bstr/bstr.h" #include "vo.h" #include "video/csputils.h" diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index 919ab2e657..f6d01948e8 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -27,9 +27,9 @@ #include "config.h" #include "stream/stream.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_msg.h" +#include "common/common.h" +#include "bstr/bstr.h" +#include "common/msg.h" #include "options/m_option.h" #include "options/path.h" diff --git a/video/out/gl_video.c b/video/out/gl_video.c index b3728eef44..b27638b904 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -30,7 +30,7 @@ #include "gl_video.h" -#include "mpvcore/bstr.h" +#include "bstr/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 ab8a92fd9e..5b29becbef 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -33,13 +33,13 @@ #include "config.h" #include "osdep/timer.h" #include "options/options.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "vo.h" #include "aspect.h" #include "input/input.h" #include "options/m_config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mpv_global.h" +#include "common/msg.h" +#include "common/global.h" #include "video/mp_image.h" #include "video/vfcap.h" #include "sub/osd.h" diff --git a/video/out/vo.h b/video/out/vo.h index 2c9eec4849..e2881155df 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -27,7 +27,7 @@ #include #include "video/img_format.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "options/options.h" #define VO_EVENT_EXPOSE 1 diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c index 89f52a8937..13885b510e 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -42,7 +42,7 @@ #include "input/keycodes.h" #include "input/input.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "input/input.h" /* caca stuff */ diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 52627d3d32..6e189bc660 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -37,7 +37,7 @@ #include "video/mp_image.h" #include "video/img_format.h" #include "video/memcpy_pic.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "w32_common.h" #include "libavutil/common.h" #include "sub/osd.h" diff --git a/video/out/vo_image.c b/video/out/vo_image.c index b08f3018b0..2bbdbcd543 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -25,11 +25,11 @@ #include #include "config.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "osdep/io.h" #include "options/path.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/out/vo.h" #include "video/csputils.h" #include "video/vfcap.h" diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 81a4280def..56933e2309 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -23,7 +23,7 @@ #include #include #include "compat/libav.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "options/options.h" #include "video/fmt-conversion.h" #include "video/mp_image.h" @@ -31,7 +31,7 @@ #include "talloc.h" #include "vo.h" -#include "mpvcore/encode_lavc.h" +#include "common/encode_lavc.h" #include "sub/osd.h" diff --git a/video/out/vo_null.c b/video/out/vo_null.c index bb20945728..b59eb13e81 100644 --- a/video/out/vo_null.c +++ b/video/out/vo_null.c @@ -25,7 +25,7 @@ #include #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/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 d1e0f3d2f0..5f24c7d65e 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -35,9 +35,9 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_msg.h" +#include "common/common.h" +#include "bstr/bstr.h" +#include "common/msg.h" #include "options/m_config.h" #include "vo.h" #include "video/vfcap.h" diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index 9e39a6197c..351ac05417 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -33,7 +33,7 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "vo.h" #include "video/vfcap.h" diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 574b453a6f..cff02731cb 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -33,7 +33,7 @@ #include "input/input.h" #include "input/keycodes.h" #include "input/input.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "osdep/timer.h" diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index c2d2bb9602..de5e05e4ec 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -29,7 +29,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/out/vo.h" #include "video/memcpy_pic.h" #include "sub/osd.h" diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 1343b54b65..07bb151e88 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -37,7 +37,7 @@ #include "config.h" #include "video/vdpau.h" #include "video/hwdec.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "talloc.h" #include "vo.h" diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index 293b3081eb..db73d79a74 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -33,7 +33,7 @@ #include "sub/osd.h" #include "video/vfcap.h" #include "video/mp_image.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/sws_utils.h" #include "wayland_common.h" diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index ead41c51c8..35ca4cda0e 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -52,7 +52,7 @@ #include "video/sws_utils.h" #include "video/fmt-conversion.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "osdep/timer.h" diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 1fa4323beb..7cd63fe965 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -45,7 +45,7 @@ #include "options/options.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" diff --git a/video/out/w32_common.c b/video/out/w32_common.c index b8fe0309af..c4fb227601 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -25,8 +25,8 @@ #include "options/options.h" #include "input/keycodes.h" #include "input/input.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_common.h" +#include "common/msg.h" +#include "common/common.h" #include "vo.h" #include "aspect.h" #include "w32_common.h" diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 5a078b775e..e45483c5f2 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -31,9 +31,9 @@ #include #include "config.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "libavutil/common.h" #include "talloc.h" diff --git a/video/out/x11_common.c b/video/out/x11_common.c index adc5ac1b21..a042bd0968 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -23,9 +23,9 @@ #include #include "config.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "input/input.h" #include "libavutil/common.h" #include "x11_common.h" -- cgit v1.2.3