From 406241005e3d897b30a5b168a16ad61f0996c43c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 6 Aug 2013 22:41:30 +0200 Subject: core: move contents to mpvcore (2/2) Followup commit. Fixes all the files references. --- video/decode/dec_video.c | 6 +++--- video/decode/vd.c | 4 ++-- video/decode/vd_lavc.c | 14 +++++++------- video/decode/vdpau.c | 2 +- video/filter/pullup.c | 4 ++-- video/filter/vf.c | 8 ++++---- video/filter/vf.h | 2 +- video/filter/vf_crop.c | 6 +++--- video/filter/vf_delogo.c | 6 +++--- video/filter/vf_divtc.c | 4 ++-- video/filter/vf_dlopen.c | 4 ++-- video/filter/vf_down3dright.c | 4 ++-- video/filter/vf_dsize.c | 2 +- video/filter/vf_eq.c | 4 ++-- video/filter/vf_expand.c | 6 +++--- video/filter/vf_flip.c | 2 +- video/filter/vf_format.c | 4 ++-- video/filter/vf_gradfun.c | 4 ++-- video/filter/vf_hqdn3d.c | 2 +- video/filter/vf_ilpack.c | 4 ++-- video/filter/vf_lavfi.c | 6 +++--- video/filter/vf_mirror.c | 2 +- video/filter/vf_noformat.c | 4 ++-- video/filter/vf_noise.c | 4 ++-- video/filter/vf_phase.c | 2 +- video/filter/vf_pp.c | 4 ++-- video/filter/vf_pullup.c | 4 ++-- video/filter/vf_rotate.c | 2 +- video/filter/vf_scale.c | 6 +++--- video/filter/vf_softpulldown.c | 2 +- video/filter/vf_stereo3d.c | 6 +++--- video/filter/vf_sub.c | 6 +++--- video/filter/vf_swapuv.c | 2 +- video/filter/vf_unsharp.c | 4 ++-- video/filter/vf_vo.c | 4 ++-- video/filter/vf_yadif.c | 6 +++--- video/fmt-conversion.c | 2 +- video/image_writer.c | 2 +- video/img_format.h | 2 +- video/mp_image.h | 2 +- video/mp_image_pool.c | 2 +- video/out/aspect.c | 4 ++-- video/out/bitmap_packer.c | 4 ++-- video/out/cocoa_common.m | 6 +++--- video/out/gl_common.c | 4 ++-- video/out/gl_common.h | 4 ++-- video/out/gl_lcms.c | 8 ++++---- video/out/gl_video.c | 2 +- video/out/vo.c | 12 ++++++------ video/out/vo.h | 4 ++-- video/out/vo_caca.c | 8 ++++---- video/out/vo_corevideo.c | 2 +- video/out/vo_direct3d.c | 6 +++--- video/out/vo_image.c | 8 ++++---- video/out/vo_lavc.c | 6 +++--- video/out/vo_null.c | 2 +- video/out/vo_opengl.c | 8 ++++---- video/out/vo_opengl_old.c | 4 ++-- video/out/vo_sdl.c | 10 +++++----- video/out/vo_vdpau.c | 6 +++--- video/out/vo_x11.c | 4 ++-- video/out/vo_xv.c | 6 +++--- video/out/w32_common.c | 12 ++++++------ video/out/wayland_common.c | 10 +++++----- video/out/x11_common.c | 12 ++++++------ video/sws_utils.c | 2 +- video/vdpau.h | 2 +- 67 files changed, 161 insertions(+), 161 deletions(-) (limited to 'video') diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 595ffb0e16..22aa8f3e75 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -17,21 +17,21 @@ */ #include "config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "osdep/timer.h" #include "stream/stream.h" #include "demux/demux_packet.h" -#include "core/codecs.h" +#include "mpvcore/codecs.h" #include "video/out/vo.h" #include "video/csputils.h" diff --git a/video/decode/vd.c b/video/decode/vd.c index db038e3d96..1518d78695 100644 --- a/video/decode/vd.c +++ b/video/decode/vd.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 90fd29f48a..0367c2afed 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -32,12 +32,12 @@ #include "talloc.h" #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" -#include "core/bstr.h" -#include "core/av_opts.h" -#include "core/av_common.h" -#include "core/codecs.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/bstr.h" +#include "mpvcore/av_opts.h" +#include "mpvcore/av_common.h" +#include "mpvcore/codecs.h" #include "compat/mpbswap.h" #include "video/fmt-conversion.h" @@ -57,7 +57,7 @@ #error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE #endif -#include "core/m_option.h" +#include "mpvcore/m_option.h" static void init_avctx(sh_video_t *sh, const char *decoder, struct hwdec *hwdec); static void uninit_avctx(sh_video_t *sh); diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c index 512f9170a3..b259ae303a 100644 --- a/video/decode/vdpau.c +++ b/video/decode/vdpau.c @@ -22,7 +22,7 @@ #include #include "lavc.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/fmt-conversion.h" #include "video/vdpau.h" #include "video/decode/dec_video.h" diff --git a/video/filter/pullup.c b/video/filter/pullup.c index 71f34f068f..2421720d70 100644 --- a/video/filter/pullup.c +++ b/video/filter/pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" #include "pullup.h" -#include "core/cpudetect.h" -#include "core/mp_common.h" +#include "mpvcore/cpudetect.h" +#include "mpvcore/mp_common.h" diff --git a/video/filter/vf.c b/video/filter/vf.c index 294c306448..f074c2059b 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -26,11 +26,11 @@ #include "config.h" -#include "core/mp_msg.h" -#include "core/m_option.h" -#include "core/m_config.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/m_config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf.h b/video/filter/vf.h index c792049b3b..29ce051869 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -22,7 +22,7 @@ #include #include "video/mp_image.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/vfcap.h" diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index c84dd22b84..cd4f077251 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -21,14 +21,14 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/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 6b716cab14..269464f605 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -28,14 +28,14 @@ #include #include -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" //===========================================================================// diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index b4718b355f..56a6698027 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -23,8 +23,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "libavutil/common.h" #include "compat/mpbswap.h" diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c index f40762beab..0a100a8b6b 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "vf_dlopen.h" diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c index 895753bafc..7cb75b14dd 100644 --- a/video/filter/vf_down3dright.c +++ b/video/filter/vf_down3dright.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c index ef1d679906..a85457e7ef 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.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 76a8b2bc99..802b2f7048 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -30,8 +30,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.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 7b1b76ee97..11983f56ec 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -24,8 +24,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" @@ -33,7 +33,7 @@ #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/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_flip.c b/video/filter/vf_flip.c index a28633c7ef..e9d2796724 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c index 639a564113..e5d4c117e7 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/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 4217af0b4d..fa136269dd 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -36,14 +36,14 @@ #include #include "config.h" -#include "core/cpudetect.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" #include "compat/x86_cpu.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct vf_priv_s { float cfg_thresh; diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 8351707659..ead6bd3466 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -24,7 +24,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.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 f153a4b7d0..d288ef07b6 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.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 9cb731ae18..352350804b 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -35,9 +35,9 @@ #include #include -#include "core/mp_msg.h" -#include "core/m_option.h" -#include "core/av_opts.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/av_opts.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c index 65e467a9cb..c51c9617cb 100644 --- a/video/filter/vf_mirror.c +++ b/video/filter/vf_mirror.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c index cfdf91401a..2a668c6d44 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/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 0af7da5c9a..9d880a6d34 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.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 5754b5f2c7..deb2b0dbe5 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.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 742c26f95c..2112685c4b 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -24,8 +24,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.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 62d0ff653c..4d0fee6be6 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.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 94132848fb..05673d76ce 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.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 35c9e3cbae..618460965a 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/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 "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int w, h; diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c index 02a1158d5d..9968c57a1f 100644 --- a/video/filter/vf_softpulldown.c +++ b/video/filter/vf_softpulldown.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c index 9d546388ff..07e8489b7a 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -24,13 +24,13 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/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 519f3c3eb7..814b8a0fca 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -28,8 +28,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/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 "core/m_option.h" +#include "mpvcore/m_option.h" static const struct vf_priv_s { int opt_top_margin, opt_bottom_margin; diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c index 10dc1da858..64d8d61b7b 100644 --- a/video/filter/vf_swapuv.c +++ b/video/filter/vf_swapuv.c @@ -24,7 +24,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c index dcca82df5b..728def61b4 100644 --- a/video/filter/vf_unsharp.c +++ b/video/filter/vf_unsharp.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index 9edb393e23..b3e7b7bd60 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index 02b23c61c5..29156986db 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -25,10 +25,10 @@ #include #include "config.h" -#include "core/cpudetect.h" -#include "core/options.h" +#include "mpvcore/cpudetect.h" +#include "mpvcore/options.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 500b4b1609..509ff31535 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "libavutil/avutil.h" #include #include "video/img_format.h" diff --git a/video/image_writer.c b/video/image_writer.c index 5224841b5d..22192ade45 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 "core/m_option.h" +#include "mpvcore/m_option.h" const struct image_writer_opts image_writer_opts_defaults = { .format = "jpg", diff --git a/video/img_format.h b/video/img_format.h index 2438c231b8..7261971e43 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -21,7 +21,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #if BYTE_ORDER == BIG_ENDIAN #define MP_SELECT_LE_BE(LE, BE) BE diff --git a/video/mp_image.h b/video/mp_image.h index 85595c5705..7a70ec6a35 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -24,7 +24,7 @@ #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "csputils.h" #include "video/img_format.h" diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c index a81a008aa1..733f2059b4 100644 --- a/video/mp_image_pool.c +++ b/video/mp_image_pool.c @@ -24,7 +24,7 @@ #include "talloc.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/mp_image.h" #include "mp_image_pool.h" 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 #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 #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 #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 #include #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 #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 #include #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 #include #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 -#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 #include -#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 #include -#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 #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 #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 #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 diff --git a/video/sws_utils.c b/video/sws_utils.c index c63e447762..2c2ac9a9b4 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -28,7 +28,7 @@ #include "video/img_format.h" #include "fmt-conversion.h" #include "csputils.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" //global sws_flags from the command line int sws_flags = 2; diff --git a/video/vdpau.h b/video/vdpau.h index bb8fe1cac8..79fc842971 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -7,7 +7,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #define CHECK_ST_ERROR(message) \ do { \ -- cgit v1.2.3