diff options
Diffstat (limited to 'video/filter')
32 files changed, 162 insertions, 161 deletions
diff --git a/video/filter/pullup.c b/video/filter/pullup.c index bd25c187d6..71f34f068f 100644 --- a/video/filter/pullup.c +++ b/video/filter/pullup.c @@ -21,8 +21,8 @@ #include <string.h> #include "config.h" #include "pullup.h" -#include "cpudetect.h" -#include "mpcommon.h" +#include "core/cpudetect.h" +#include "core/mp_common.h" diff --git a/video/filter/vf.c b/video/filter/vf.c index 10b9fa546f..cf8866f0ac 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -26,16 +26,16 @@ #include "config.h" -#include "mp_msg.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/mp_msg.h" +#include "core/m_option.h" +#include "core/m_struct.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" extern const vf_info_t vf_info_vo; extern const vf_info_t vf_info_crop; diff --git a/video/filter/vf.h b/video/filter/vf.h index 4c50f0e9cc..8f20b20466 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -19,12 +19,13 @@ #ifndef MPLAYER_VF_H #define MPLAYER_VF_H -#include "mp_image.h" -#include "mpcommon.h" -#include "stdbool.h" +#include <stdbool.h> -#include "mpc_info.h" -#include "vfcap.h" +#include "video/mp_image.h" +#include "core/mp_common.h" + +#include "core/mpc_info.h" +#include "video/vfcap.h" struct MPOpts; struct vf_instance; diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index c4e0b4253b..86eb1d2140 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -21,15 +21,15 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.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 add6dc6b0c..f53e5059bd 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -28,15 +28,15 @@ #include <errno.h> #include <math.h> -#include "mp_msg.h" -#include "cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" //===========================================================================// diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index 6faeb7c411..a99bd8f96e 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -23,16 +23,16 @@ #include <math.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" #include "libavutil/common.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" const vf_info_t vf_info_divtc; diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c index 183b31be84..8f24e2356d 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -21,14 +21,14 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" #include "vf_dlopen.h" diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c index 561bc898d0..64ecaffb94 100644 --- a/video/filter/vf_down3dright.c +++ b/video/filter/vf_down3dright.c @@ -22,14 +22,14 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" struct vf_priv_s { int skipline; diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c index d46d22ebb2..e1c246135b 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -22,10 +22,10 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" struct vf_priv_s { diff --git a/video/filter/vf_eq2.c b/video/filter/vf_eq2.c index fe4a89fb13..b39e8b087c 100644 --- a/video/filter/vf_eq2.c +++ b/video/filter/vf_eq2.c @@ -30,11 +30,11 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" #define LUT16 diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c index 839820510d..7c9feb4375 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -24,17 +24,17 @@ #include <libavutil/common.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.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 e8660ceb51..d5792f27ca 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -21,12 +21,12 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "mp_image.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/video_out.h" +#include "video/out/vo.h" //===========================================================================// diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c index 422956539b..ca71bb0548 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -22,14 +22,14 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" static struct vf_priv_s { unsigned int fmt; diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c index eb73cfa2a4..b7f59f7d5c 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -36,15 +36,15 @@ #include <libavutil/common.h> #include "config.h" -#include "cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/cpudetect.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" -#include "ffmpeg_files/x86_cpu.h" +#include "video/memcpy_pic.h" +#include "compat/x86_cpu.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" struct vf_priv_s { float cfg_thresh; diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 95cdba1ef5..ff01a6d422 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -24,9 +24,9 @@ #include <inttypes.h> #include <math.h> -#include "mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/mp_msg.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" #define PARAM1_DEFAULT 4.0 diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c index e98d70d85d..05eff04f26 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -22,11 +22,11 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" #include "libavutil/attributes.h" diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c index b48d9a2ef6..e201edecd1 100644 --- a/video/filter/vf_mirror.c +++ b/video/filter/vf_mirror.c @@ -22,10 +22,10 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c index b143ac0005..0da691fec2 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -22,14 +22,14 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" static struct vf_priv_s { unsigned int fmt; diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c index 87a480d655..df359833d4 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -25,13 +25,13 @@ #include <math.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" #include "libavutil/mem.h" #define MAX_NOISE 4096 diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 568c8f1f45..74e8a1ce47 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -22,13 +22,13 @@ #include <limits.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" enum mode { PROGRESSIVE, TOP_FIRST, BOTTOM_FIRST, TOP_FIRST_ANALYZE, BOTTOM_FIRST_ANALYZE, diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c index 9647032002..7ff079d1da 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -23,11 +23,11 @@ #include <errno.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" #include "libpostproc/postprocess.h" diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c index 97f851f348..c03d60341f 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -21,14 +21,14 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" #include "pullup.h" diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c index 19eeae6d35..a59ddbc310 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -22,10 +22,10 @@ #include <inttypes.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" struct vf_priv_s { diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 5ea62bacbd..f5a348559f 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -23,23 +23,23 @@ #include <sys/types.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "fmt-conversion.h" -#include "mpbswap.h" +#include "video/fmt-conversion.h" +#include "compat/mpbswap.h" -#include "libmpcodecs/sws_utils.h" +#include "video/sws_utils.h" -#include "libvo/csputils.h" +#include "video/csputils.h" // VOFLAG_SWSCALE -#include "libvo/video_out.h" +#include "video/out/vo.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" static struct vf_priv_s { int w,h; diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c index 693d871e5f..8b937b0648 100644 --- a/video/filter/vf_screenshot.c +++ b/video/filter/vf_screenshot.c @@ -23,13 +23,13 @@ #include <string.h> #include <inttypes.h> -#include "mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/mp_msg.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libmpcodecs/sws_utils.h" -#include "fmt-conversion.h" -#include "libvo/fastmemcpy.h" +#include "video/sws_utils.h" +#include "video/fmt-conversion.h" +#include "video/memcpy_pic.h" #include <libswscale/swscale.h> diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c index d07f9d6e26..80f353e548 100644 --- a/video/filter/vf_softpulldown.c +++ b/video/filter/vf_softpulldown.c @@ -21,13 +21,13 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" struct vf_priv_s { int state; diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c index 60208cb3c6..f1b1a82409 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -24,17 +24,17 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "m_struct.h" -#include "m_option.h" +#include "core/m_struct.h" +#include "core/m_option.h" #include "libavutil/common.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" //==types==// typedef enum stereo_code { diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c index 2d5de3a7ba..12149af007 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -28,20 +28,20 @@ #include <libavutil/common.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" #include "sub/sub.h" #include "sub/dec_sub.h" -#include "libvo/fastmemcpy.h" -#include "libvo/csputils.h" +#include "video/memcpy_pic.h" +#include "video/csputils.h" -#include "m_option.h" -#include "m_struct.h" +#include "core/m_option.h" +#include "core/m_struct.h" static const struct vf_priv_s { int outh, outw; diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c index 6edb256759..1aa0b1061f 100644 --- a/video/filter/vf_swapuv.c +++ b/video/filter/vf_swapuv.c @@ -24,9 +24,9 @@ #include <inttypes.h> #include <assert.h> -#include "mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/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 69368d6bf5..4a53d0a795 100644 --- a/video/filter/vf_unsharp.c +++ b/video/filter/vf_unsharp.c @@ -25,13 +25,13 @@ #include <math.h> #include "config.h" -#include "mp_msg.h" -#include "cpudetect.h" +#include "core/mp_msg.h" +#include "core/cpudetect.h" -#include "img_format.h" -#include "mp_image.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" #include "libavutil/common.h" //===========================================================================// diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index d11724f881..5c4d83c01d 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -22,13 +22,13 @@ #include <stdbool.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "mp_image.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/video_out.h" +#include "video/out/vo.h" #include "sub/sub.h" diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index bb6595cdcd..1158cffbbf 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -25,14 +25,14 @@ #include <math.h> #include "config.h" -#include "cpudetect.h" -#include "options.h" +#include "core/cpudetect.h" +#include "core/options.h" -#include "mp_msg.h" -#include "img_format.h" -#include "mp_image.h" +#include "core/mp_msg.h" +#include "video/img_format.h" +#include "video/mp_image.h" #include "vf.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" #include "libavutil/common.h" //===========================================================================// |