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/filter/pullup.c | 4 ++-- video/filter/vf.c | 2 +- video/filter/vf.h | 2 +- video/filter/vf_crop.c | 2 +- video/filter/vf_delogo.c | 4 ++-- video/filter/vf_divtc.c | 4 ++-- video/filter/vf_dlopen.c | 2 +- video/filter/vf_dsize.c | 2 +- video/filter/vf_eq.c | 4 ++-- video/filter/vf_expand.c | 2 +- video/filter/vf_flip.c | 2 +- video/filter/vf_format.c | 2 +- video/filter/vf_gradfun.c | 2 +- video/filter/vf_hqdn3d.c | 2 +- video/filter/vf_ilpack.c | 4 ++-- video/filter/vf_lavfi.c | 4 ++-- video/filter/vf_lavfi.h | 2 +- video/filter/vf_mirror.c | 2 +- video/filter/vf_noformat.c | 2 +- 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 | 2 +- video/filter/vf_softpulldown.c | 2 +- video/filter/vf_stereo3d.c | 2 +- video/filter/vf_sub.c | 2 +- video/filter/vf_swapuv.c | 2 +- video/filter/vf_unsharp.c | 4 ++-- video/filter/vf_yadif.c | 4 ++-- 31 files changed, 42 insertions(+), 42 deletions(-) (limited to 'video/filter') diff --git a/video/filter/pullup.c b/video/filter/pullup.c index 2421720d70..14c31dc365 100644 --- a/video/filter/pullup.c +++ b/video/filter/pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" #include "pullup.h" -#include "mpvcore/cpudetect.h" -#include "mpvcore/mp_common.h" +#include "common/cpudetect.h" +#include "common/common.h" diff --git a/video/filter/vf.c b/video/filter/vf.c index 4143a835b1..77a86501ad 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -26,7 +26,7 @@ #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "options/m_config.h" diff --git a/video/filter/vf.h b/video/filter/vf.h index 5892247556..96f4aaef7e 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -22,7 +22,7 @@ #include #include "video/mp_image.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "video/vfcap.h" diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index dde297f910..cd286910ab 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "video/img_format.h" diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c index 0c80bec057..d1e7ea1c4a 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -28,8 +28,8 @@ #include #include -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index 6c8574039d..bf0b7426b4 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -23,8 +23,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.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 4b7551167b..dedafda85c 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.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 ed4d3ef871..158b1825cc 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -23,7 +23,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c index 542627cb3b..b5a898a58f 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -30,8 +30,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c index fe4b8baccb..e4d9f2dd33 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -24,7 +24,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "video/img_format.h" diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c index 7c652e1138..2dde098c51 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/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 bdbefec542..9ac6fa9119 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c index ea3b615caa..87464d5bb6 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -36,7 +36,7 @@ #include #include "config.h" -#include "mpvcore/cpudetect.h" +#include "common/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 07cea5ad28..883c495f22 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -24,7 +24,7 @@ #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c index d79f557652..2ae129f6de 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index 98216c08e4..b20383881a 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -36,9 +36,9 @@ #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" -#include "mpvcore/av_opts.h" +#include "common/av_opts.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h index aef8a93448..48b658041d 100644 --- a/video/filter/vf_lavfi.h +++ b/video/filter/vf_lavfi.h @@ -3,7 +3,7 @@ #include "config.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "vf.h" struct vf_lw_opts; diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c index 36232f7f2b..2cf9e4a78d 100644 --- a/video/filter/vf_mirror.c +++ b/video/filter/vf_mirror.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/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 50f9f7f26f..1529cfadfc 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c index 0f20cfc353..72c02b22ad 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 2a8b9dfc61..38668f6d8e 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c index c49ed218b5..111ab798ef 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -24,8 +24,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c index a0d2c7da26..4fb51fe9d0 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c index bbb02647d1..b767d37c4b 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index c80113f6fd..7d935462a0 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -25,7 +25,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "video/img_format.h" diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c index 4e713bd47f..f2dbba29bf 100644 --- a/video/filter/vf_softpulldown.c +++ b/video/filter/vf_softpulldown.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/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 b9d97756fe..c896b4a73b 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -24,7 +24,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "video/img_format.h" diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c index e9f056e113..d2b97d8e30 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -28,7 +28,7 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "video/img_format.h" diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c index 8233d6cab5..eabc5f1ed3 100644 --- a/video/filter/vf_swapuv.c +++ b/video/filter/vf_swapuv.c @@ -24,7 +24,7 @@ #include #include -#include "mpvcore/mp_msg.h" +#include "common/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 582449ad53..179e9b78ae 100644 --- a/video/filter/vf_unsharp.c +++ b/video/filter/vf_unsharp.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/cpudetect.h" +#include "common/msg.h" +#include "common/cpudetect.h" #include "options/m_option.h" #include "video/img_format.h" diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index 46e59bf741..3eeca30021 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -25,10 +25,10 @@ #include #include "config.h" -#include "mpvcore/cpudetect.h" +#include "common/cpudetect.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -- cgit v1.2.3