From eb15151705d47d23da844449126cc6b4879f110e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 02:02:25 +0100 Subject: Move options/config related files from mpvcore/ to options/ Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok. --- video/filter/vf.c | 6 +++--- video/filter/vf_crop.c | 4 ++-- video/filter/vf_delogo.c | 2 +- video/filter/vf_divtc.c | 2 +- video/filter/vf_dlopen.c | 2 +- video/filter/vf_dsize.c | 2 +- video/filter/vf_eq.c | 2 +- video/filter/vf_expand.c | 4 ++-- video/filter/vf_format.c | 2 +- video/filter/vf_gradfun.c | 2 +- video/filter/vf_hqdn3d.c | 2 +- video/filter/vf_ilpack.c | 2 +- video/filter/vf_lavfi.c | 2 +- video/filter/vf_lavfi.h | 2 +- video/filter/vf_noformat.c | 2 +- video/filter/vf_noise.c | 2 +- video/filter/vf_phase.c | 2 +- video/filter/vf_pp.c | 2 +- video/filter/vf_pullup.c | 2 +- video/filter/vf_rotate.c | 2 +- video/filter/vf_scale.c | 4 ++-- video/filter/vf_stereo3d.c | 4 ++-- video/filter/vf_sub.c | 4 ++-- video/filter/vf_unsharp.c | 2 +- video/filter/vf_vavpp.c | 2 +- video/filter/vf_yadif.c | 2 +- 26 files changed, 33 insertions(+), 33 deletions(-) (limited to 'video/filter') diff --git a/video/filter/vf.c b/video/filter/vf.c index c1e9084b0d..4143a835b1 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -27,10 +27,10 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" -#include "mpvcore/m_config.h" +#include "options/m_option.h" +#include "options/m_config.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index fffcc62921..dde297f910 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -22,13 +22,13 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "mpvcore/m_option.h" +#include "options/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 3ec6755f03..0c80bec057 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -36,7 +36,7 @@ #include "vf_lavfi.h" #include "video/memcpy_pic.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" //===========================================================================// diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index c471d4a774..6c8574039d 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -25,7 +25,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.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 5bf8198ce7..4b7551167b 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -28,7 +28,7 @@ #include "video/mp_image.h" #include "vf.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "vf_dlopen.h" diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c index 9aa5f719ad..ed4d3ef871 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -24,7 +24,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 e423b301ff..542627cb3b 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -32,7 +32,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 2e72f6bff7..fe4b8baccb 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -25,7 +25,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "video/img_format.h" #include "video/mp_image.h" @@ -33,7 +33,7 @@ #include "video/memcpy_pic.h" -#include "mpvcore/m_option.h" +#include "options/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_format.c b/video/filter/vf_format.c index e673fd8f60..bdbefec542 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -28,7 +28,7 @@ #include "video/mp_image.h" #include "vf.h" -#include "mpvcore/m_option.h" +#include "options/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 7c9a0ecab3..ea3b615caa 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -43,7 +43,7 @@ #include "video/memcpy_pic.h" #include "compat/x86_cpu.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "vf_lavfi.h" diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 1a5736f98e..07cea5ad28 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -25,7 +25,7 @@ #include #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 bd7e863dee..d79f557652 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -24,7 +24,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 47701ed1f9..98216c08e4 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -37,7 +37,7 @@ #include #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "mpvcore/av_opts.h" #include "video/img_format.h" diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h index 45765d9dea..aef8a93448 100644 --- a/video/filter/vf_lavfi.h +++ b/video/filter/vf_lavfi.h @@ -37,7 +37,7 @@ static void vf_lw_set_recreate_cb(struct vf_instance *vf, void (*recreate)(struct vf_instance *vf)) { } -#include "mpvcore/m_option.h" +#include "options/m_option.h" static const struct m_sub_options vf_lw_conf = {0}; #endif diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c index f3b193bc4e..50f9f7f26f 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -28,7 +28,7 @@ #include "video/mp_image.h" #include "vf.h" -#include "mpvcore/m_option.h" +#include "options/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 8525b06dc2..0f20cfc353 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -27,7 +27,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 c439a2466a..2a8b9dfc61 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -23,7 +23,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 dff8b2b3ec..c49ed218b5 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -26,7 +26,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 36fac55cc5..a0d2c7da26 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -23,7 +23,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 0105cb2c1d..bbb02647d1 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -23,7 +23,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.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 268e65ae59..c80113f6fd 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -26,7 +26,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/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 "mpvcore/m_option.h" +#include "options/m_option.h" static struct vf_priv_s { int w, h; diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c index 6bd13ada87..b9d97756fe 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -25,12 +25,12 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "mpvcore/m_option.h" +#include "options/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 bd2ab88fd0..e9f056e113 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -29,7 +29,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/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 "mpvcore/m_option.h" +#include "options/m_option.h" struct vf_priv_s { int opt_top_margin, opt_bottom_margin; diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c index 1cab2ada0c..582449ad53 100644 --- a/video/filter/vf_unsharp.c +++ b/video/filter/vf_unsharp.c @@ -27,7 +27,7 @@ #include "config.h" #include "mpvcore/mp_msg.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c index dfd99e8a3c..6c96ae1bda 100644 --- a/video/filter/vf_vavpp.c +++ b/video/filter/vf_vavpp.c @@ -19,7 +19,7 @@ #include #include "config.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "vf.h" #include "video/vaapi.h" #include "video/hwdec.h" diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index 7cbfb1633c..46e59bf741 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -26,7 +26,7 @@ #include "config.h" #include "mpvcore/cpudetect.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/mp_msg.h" #include "video/img_format.h" -- cgit v1.2.3