From 4873b32c5959c988af1769529ff72e3fd62fba82 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Nov 2012 01:06:43 +0100 Subject: Rename directories, move files (step 2 of 2) Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.) --- video/decode/dec_video.c | 22 +++++++++++----------- video/decode/dec_video.h | 2 +- video/decode/vd.c | 16 ++++++++-------- video/decode/vd.h | 6 +++--- video/decode/vd_lavc.c | 22 +++++++++++----------- video/filter/pullup.c | 4 ++-- video/filter/vf.c | 12 ++++++------ video/filter/vf.h | 11 ++++++----- video/filter/vf_crop.c | 12 ++++++------ video/filter/vf_delogo.c | 14 +++++++------- video/filter/vf_divtc.c | 12 ++++++------ video/filter/vf_dlopen.c | 10 +++++----- video/filter/vf_down3dright.c | 10 +++++----- video/filter/vf_dsize.c | 6 +++--- video/filter/vf_eq2.c | 8 ++++---- video/filter/vf_expand.c | 14 +++++++------- video/filter/vf_flip.c | 6 +++--- video/filter/vf_format.c | 10 +++++----- video/filter/vf_gradfun.c | 14 +++++++------- video/filter/vf_hqdn3d.c | 6 +++--- video/filter/vf_ilpack.c | 8 ++++---- video/filter/vf_mirror.c | 6 +++--- video/filter/vf_noformat.c | 10 +++++----- video/filter/vf_noise.c | 10 +++++----- video/filter/vf_phase.c | 8 ++++---- video/filter/vf_pp.c | 8 ++++---- video/filter/vf_pullup.c | 10 +++++----- video/filter/vf_rotate.c | 6 +++--- video/filter/vf_scale.c | 22 +++++++++++----------- video/filter/vf_screenshot.c | 12 ++++++------ video/filter/vf_softpulldown.c | 8 ++++---- video/filter/vf_stereo3d.c | 14 +++++++------- video/filter/vf_sub.c | 16 ++++++++-------- video/filter/vf_swapuv.c | 6 +++--- video/filter/vf_unsharp.c | 10 +++++----- video/filter/vf_vo.c | 8 ++++---- video/filter/vf_yadif.c | 12 ++++++------ video/fmt-conversion.c | 4 ++-- video/image_writer.c | 15 +++++++-------- video/img_format.c | 4 ++-- video/img_format.h | 2 +- video/mp_image.c | 8 ++++---- video/mp_image.h | 4 ++-- video/out/aspect.c | 8 ++++---- video/out/bitmap_packer.c | 6 +++--- video/out/cocoa_common.h | 2 +- video/out/cocoa_common.m | 12 ++++++------ video/out/geometry.c | 2 +- video/out/gl_common.c | 3 +-- video/out/gl_common.h | 10 +++++----- video/out/osx_common.c | 9 ++++----- video/out/vo.c | 16 ++++++++-------- video/out/vo.h | 4 ++-- video/out/vo_caca.c | 14 +++++++------- video/out/vo_corevideo.m | 11 +++++------ video/out/vo_direct3d.c | 18 +++++++++--------- video/out/vo_image.c | 21 ++++++++++----------- video/out/vo_lavc.c | 16 ++++++++-------- video/out/vo_null.c | 8 ++++---- video/out/vo_opengl.c | 18 +++++++++--------- video/out/vo_opengl_old.c | 12 ++++++------ video/out/vo_vdpau.c | 14 +++++++------- video/out/vo_x11.c | 12 ++++++------ video/out/vo_xv.c | 16 ++++++++-------- video/out/w32_common.c | 14 +++++++------- video/out/x11_common.c | 16 ++++++++-------- video/sws_utils.c | 10 +++++----- 67 files changed, 348 insertions(+), 352 deletions(-) (limited to 'video') diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 5c6d3113da..5c6cfc96ce 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -17,35 +17,35 @@ */ #include "config.h" -#include "options.h" +#include "core/options.h" #include #include #include #include -#include "mp_msg.h" +#include "core/mp_msg.h" #include "osdep/timer.h" #include "osdep/shmem.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" +#include "demux/demux.h" -#include "codec-cfg.h" +#include "core/codec-cfg.h" -#include "libvo/video_out.h" -#include "libvo/csputils.h" +#include "video/out/vo.h" +#include "video/csputils.h" -#include "libmpdemux/stheader.h" -#include "vd.h" -#include "vf.h" +#include "demux/stheader.h" +#include "video/decode/vd.h" +#include "video/filter/vf.h" -#include "dec_video.h" +#include "video/decode/dec_video.h" // =================================================================== -#include "cpudetect.h" +#include "core/cpudetect.h" int field_dominance = -1; diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index f871198988..9eb90a5d5a 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_DEC_VIDEO_H #define MPLAYER_DEC_VIDEO_H -#include "libmpdemux/stheader.h" +#include "demux/stheader.h" struct osd_state; diff --git a/video/decode/vd.c b/video/decode/vd.c index 3bfc17c895..31b40e46da 100644 --- a/video/decode/vd.c +++ b/video/decode/vd.c @@ -21,21 +21,21 @@ #include #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "codec-cfg.h" +#include "core/codec-cfg.h" -#include "img_format.h" +#include "video/img_format.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "dec_video.h" #include "vd.h" -#include "vf.h" -#include "libvo/video_out.h" +#include "video/filter/vf.h" +#include "video/out/vo.h" extern const vd_functions_t mpcodecs_vd_ffmpeg; diff --git a/video/decode/vd.h b/video/decode/vd.h index 6b9803a611..2495a22dc3 100644 --- a/video/decode/vd.h +++ b/video/decode/vd.h @@ -19,9 +19,9 @@ #ifndef MPLAYER_VD_H #define MPLAYER_VD_H -#include "mp_image.h" -#include "mpc_info.h" -#include "libmpdemux/stheader.h" +#include "video/mp_image.h" +#include "core/mpc_info.h" +#include "demux/stheader.h" typedef struct mp_codec_info vd_info_t; diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e078de4419..929c6c77f3 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -29,20 +29,20 @@ #include "talloc.h" #include "config.h" -#include "mp_msg.h" -#include "options.h" -#include "av_opts.h" +#include "core/mp_msg.h" +#include "core/options.h" +#include "core/av_opts.h" -#include "mpbswap.h" -#include "fmt-conversion.h" +#include "compat/mpbswap.h" +#include "video/fmt-conversion.h" #include "vd.h" -#include "img_format.h" -#include "libmpdemux/stheader.h" -#include "libmpdemux/demux_packet.h" -#include "codec-cfg.h" +#include "video/img_format.h" +#include "demux/stheader.h" +#include "demux/demux_packet.h" +#include "core/codec-cfg.h" #include "osdep/numcores.h" -#include "libvo/csputils.h" +#include "video/csputils.h" static const vd_info_t info = { "libavcodec video codecs", @@ -76,7 +76,7 @@ typedef struct { enum AVDiscard skip_frame; } vd_ffmpeg_ctx; -#include "m_option.h" +#include "core/m_option.h" static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); 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 #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 -#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 #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 #include -#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 #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 #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 #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 #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 #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 #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 #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 #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 #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 #include -#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 #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 #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 #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 #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 #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 #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 #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 #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 #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 #include -#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 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 #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 #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 #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 #include -#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 #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 #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 #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" //===========================================================================// diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 81ab7a45fb..6ce5140d58 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -16,10 +16,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "mp_msg.h" +#include "core/mp_msg.h" #include "libavutil/avutil.h" #include -#include "libmpcodecs/img_format.h" +#include "video/img_format.h" #include "fmt-conversion.h" static const struct { diff --git a/video/image_writer.c b/video/image_writer.c index 877c89e700..9f4ca4d2b1 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -22,6 +22,7 @@ #include #include +#include #include "config.h" @@ -33,16 +34,14 @@ #include "image_writer.h" #include "talloc.h" -#include "libmpcodecs/img_format.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/dec_video.h" -#include "libmpcodecs/vf.h" -#include "fmt-conversion.h" +#include "video/img_format.h" +#include "video/mp_image.h" +#include "video/fmt-conversion.h" -#include "libmpcodecs/sws_utils.h" -#include "libmpcodecs/vf.h" +#include "video/sws_utils.h" +#include "video/filter/vf.h" -#include "m_option.h" +#include "core/m_option.h" const struct image_writer_opts image_writer_opts_defaults = { .format = "jpg", diff --git a/video/img_format.c b/video/img_format.c index 1084a8f9a1..8038e82324 100644 --- a/video/img_format.c +++ b/video/img_format.c @@ -17,9 +17,9 @@ */ #include "config.h" -#include "img_format.h" +#include "video/img_format.h" #include "stdio.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" #include diff --git a/video/img_format.h b/video/img_format.h index b488734f02..c32600f519 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -21,7 +21,7 @@ #include #include "config.h" -#include "bstr.h" +#include "core/bstr.h" /* RGB/BGR Formats */ diff --git a/video/mp_image.c b/video/mp_image.c index c0227e4b1d..e910830a8b 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -24,11 +24,11 @@ #include "talloc.h" -#include "libmpcodecs/img_format.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/sws_utils.h" +#include "video/img_format.h" +#include "video/mp_image.h" +#include "video/sws_utils.h" -#include "libvo/fastmemcpy.h" +#include "video/memcpy_pic.h" #include "libavutil/mem.h" #include "libavutil/common.h" diff --git a/video/mp_image.h b/video/mp_image.h index f2d149bc9d..8ce0b98edc 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -23,8 +23,8 @@ #include #include #include -#include "mp_msg.h" -#include "libvo/csputils.h" +#include "core/mp_msg.h" +#include "csputils.h" //--------- codec's requirements (filled by the codec/vf) --------- diff --git a/video/out/aspect.c b/video/out/aspect.c index f3cd00a5e5..454f865d37 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -19,11 +19,11 @@ /* Stuff for correct aspect scaling. */ #include "aspect.h" #include "geometry.h" -#include "video_out.h" -#include "mp_msg.h" -#include "options.h" +#include "vo.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "video_out.h" +#include "vo.h" void aspect_save_videores(struct vo *vo, int w, int h, int d_w, int d_h) { diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index 603a6ce410..aae0703072 100644 --- a/video/out/bitmap_packer.c +++ b/video/out/bitmap_packer.c @@ -26,10 +26,10 @@ #include "talloc.h" #include "bitmap_packer.h" -#include "mp_msg.h" -#include "mpcommon.h" +#include "core/mp_msg.h" +#include "core/mp_common.h" #include "sub/dec_sub.h" -#include "fastmemcpy.h" +#include "video/memcpy_pic.h" #define IS_POWER_OF_2(x) (((x) > 0) && !(((x) - 1) & (x))) diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h index 079e497441..4227782251 100644 --- a/video/out/cocoa_common.h +++ b/video/out/cocoa_common.h @@ -20,7 +20,7 @@ #ifndef MPLAYER_COCOA_COMMON_H #define MPLAYER_COCOA_COMMON_H -#include "video_out.h" +#include "vo.h" struct vo_cocoa_state; diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 337e0a32be..82be8a619d 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -26,17 +26,17 @@ #include "config.h" -#include "options.h" -#include "video_out.h" +#include "core/options.h" +#include "vo.h" #include "aspect.h" -#include "mp_fifo.h" +#include "core/mp_fifo.h" #include "talloc.h" -#include "input/input.h" -#include "input/keycodes.h" +#include "core/input/input.h" +#include "core/input/keycodes.h" #include "osx_common.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #ifndef NSOpenGLPFAOpenGLProfile #define NSOpenGLPFAOpenGLProfile 99 diff --git a/video/out/geometry.c b/video/out/geometry.c index 941528aea9..c90f0c9a0c 100644 --- a/video/out/geometry.c +++ b/video/out/geometry.c @@ -22,7 +22,7 @@ #include #include #include "geometry.h" -#include "mp_msg.h" +#include "core/mp_msg.h" /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */ char *vo_geometry; diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 80db2eacc4..1781233bf7 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -42,10 +42,9 @@ #include #include "talloc.h" #include "gl_common.h" -#include "csputils.h" #include "aspect.h" #include "pnm_loader.h" -#include "options.h" +#include "core/options.h" #include "sub/sub.h" #include "bitmap_packer.h" diff --git a/video/out/gl_common.h b/video/out/gl_common.h index 9816566097..de893966df 100644 --- a/video/out/gl_common.h +++ b/video/out/gl_common.h @@ -28,12 +28,12 @@ #include #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "video_out.h" -#include "csputils.h" +#include "vo.h" +#include "video/csputils.h" -#include "libmpcodecs/mp_image.h" +#include "video/mp_image.h" #if defined(CONFIG_GL_COCOA) && !defined(CONFIG_GL_X11) #ifdef GL_VERSION_3_0 @@ -47,7 +47,7 @@ #include #endif -#include "libvo/gl_header_fixes.h" +#include "video/out/gl_header_fixes.h" struct GL; typedef struct GL GL; diff --git a/video/out/osx_common.c b/video/out/osx_common.c index 2aa0a28126..ff2df8daff 100644 --- a/video/out/osx_common.c +++ b/video/out/osx_common.c @@ -20,12 +20,11 @@ // only to get keycode definitions from HIToolbox/Events.h #include #include -#include "config.h" #include "osx_common.h" -#include "video_out.h" -#include "input/keycodes.h" -#include "input/input.h" -#include "mp_msg.h" +#include "video/out/vo.h" +#include "core/input/keycodes.h" +#include "core/input/input.h" +#include "core/mp_msg.h" /* * Define keycodes only found in OSX >= 10.5 for older versions diff --git a/video/out/vo.c b/video/out/vo.c index 571f00da4d..04bd9cbb1b 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -28,17 +28,17 @@ //#include #include "config.h" -#include "options.h" +#include "core/options.h" #include "talloc.h" -#include "bstr.h" -#include "video_out.h" +#include "core/bstr.h" +#include "vo.h" #include "aspect.h" #include "geometry.h" -#include "input/input.h" -#include "mp_fifo.h" -#include "m_config.h" -#include "mp_msg.h" -#include "libmpcodecs/vfcap.h" +#include "core/input/input.h" +#include "core/mp_fifo.h" +#include "core/m_config.h" +#include "core/mp_msg.h" +#include "video/vfcap.h" #include "sub/sub.h" #include "osdep/shmem.h" diff --git a/video/out/vo.h b/video/out/vo.h index ac2ded9b3c..71ef635050 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -26,8 +26,8 @@ #include #include -#include "libmpcodecs/img_format.h" -#include "mpcommon.h" +#include "video/img_format.h" +#include "core/mp_common.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 2d998bf91d..63413e0e5e 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -35,15 +35,15 @@ #include #include "config.h" -#include "video_out.h" +#include "vo.h" #include "sub/sub.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/vfcap.h" +#include "video/mp_image.h" +#include "video/vfcap.h" -#include "input/keycodes.h" -#include "input/input.h" -#include "mp_msg.h" -#include "mp_fifo.h" +#include "core/input/keycodes.h" +#include "core/input/input.h" +#include "core/mp_msg.h" +#include "core/mp_fifo.h" /* caca stuff */ static caca_canvas_t *canvas; diff --git a/video/out/vo_corevideo.m b/video/out/vo_corevideo.m index 5116ab653c..627281b4e0 100644 --- a/video/out/vo_corevideo.m +++ b/video/out/vo_corevideo.m @@ -24,16 +24,15 @@ #import "vo_corevideo.h" // mplayer includes -#import "fastmemcpy.h" #import "talloc.h" -#import "video_out.h" +#import "vo.h" #import "aspect.h" #import "sub/sub.h" -#import "subopt-helper.h" +#import "core/subopt-helper.h" -#import "csputils.h" -#import "libmpcodecs/vfcap.h" -#import "libmpcodecs/mp_image.h" +#import "video/csputils.h" +#import "video/vfcap.h" +#import "video/mp_image.h" #import "gl_common.h" #import "gl_osd.h" diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 294a101ffe..f1c92d2a6e 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -27,16 +27,16 @@ #include #include #include "config.h" -#include "options.h" -#include "subopt-helper.h" +#include "core/options.h" +#include "core/subopt-helper.h" #include "talloc.h" -#include "video_out.h" -#include "libmpcodecs/vfcap.h" -#include "csputils.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/img_format.h" -#include "fastmemcpy.h" -#include "mp_msg.h" +#include "vo.h" +#include "video/vfcap.h" +#include "video/csputils.h" +#include "video/mp_image.h" +#include "video/img_format.h" +#include "video/memcpy_pic.h" +#include "core/mp_msg.h" #include "aspect.h" #include "w32_common.h" #include "libavutil/common.h" diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 7f80a16f35..7b7c367ad4 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -25,19 +25,18 @@ #include #include "config.h" -#include "bstr.h" +#include "core/bstr.h" #include "osdep/io.h" -#include "path.h" +#include "core/path.h" #include "talloc.h" -#include "mp_msg.h" -#include "libvo/video_out.h" -#include "libvo/csputils.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" -#include "fmt-conversion.h" -#include "image_writer.h" -#include "m_config.h" -#include "m_option.h" +#include "core/mp_msg.h" +#include "video/out/vo.h" +#include "video/csputils.h" +#include "video/vfcap.h" +#include "video/mp_image.h" +#include "video/fmt-conversion.h" +#include "video/image_writer.h" +#include "core/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 b86cd76509..e502e57dd2 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -22,16 +22,16 @@ #include #include -#include "mpcommon.h" -#include "options.h" -#include "fmt-conversion.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/vfcap.h" -#include "subopt-helper.h" +#include "core/mp_common.h" +#include "core/options.h" +#include "video/fmt-conversion.h" +#include "video/mp_image.h" +#include "video/vfcap.h" +#include "core/subopt-helper.h" #include "talloc.h" -#include "video_out.h" +#include "vo.h" -#include "encode_lavc.h" +#include "core/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 1f307f7f5b..fa1c77a35a 100644 --- a/video/out/vo_null.c +++ b/video/out/vo_null.c @@ -25,10 +25,10 @@ #include #include #include "config.h" -#include "mp_msg.h" -#include "video_out.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" +#include "core/mp_msg.h" +#include "vo.h" +#include "video/vfcap.h" +#include "video/mp_image.h" static int draw_slice(struct vo *vo, uint8_t *image[], int stride[], int w, int h, int x, int y) diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 7b5289838f..1900fd84a1 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -37,13 +37,13 @@ #endif #include "talloc.h" -#include "mpcommon.h" -#include "bstr.h" -#include "mp_msg.h" -#include "subopt-helper.h" -#include "video_out.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" +#include "core/mp_common.h" +#include "core/bstr.h" +#include "core/mp_msg.h" +#include "core/subopt-helper.h" +#include "vo.h" +#include "video/vfcap.h" +#include "video/mp_image.h" #include "geometry.h" #include "sub/sub.h" #include "bitmap_packer.h" @@ -52,11 +52,11 @@ #include "gl_osd.h" #include "filter_kernels.h" #include "aspect.h" -#include "fastmemcpy.h" +#include "video/memcpy_pic.h" static const char vo_opengl_shaders[] = // Generated from libvo/vo_opengl_shaders.glsl -#include "libvo/vo_opengl_shaders.h" +#include "video/out/vo_opengl_shaders.h" ; // Pixel width of 1D lookup textures. diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index b8b1fd4813..e1695de583 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -30,18 +30,18 @@ #include "config.h" #include "talloc.h" -#include "mp_msg.h" -#include "subopt-helper.h" -#include "video_out.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" +#include "core/mp_msg.h" +#include "core/subopt-helper.h" +#include "vo.h" +#include "video/vfcap.h" +#include "video/mp_image.h" #include "geometry.h" #include "sub/sub.h" #include "gl_common.h" #include "gl_osd.h" #include "aspect.h" -#include "fastmemcpy.h" +#include "video/memcpy_pic.h" //for gl_priv.use_yuv #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE)) diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index a523ea5815..f94531379a 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -39,17 +39,17 @@ #include #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" #include "talloc.h" -#include "video_out.h" +#include "vo.h" #include "x11_common.h" #include "aspect.h" -#include "csputils.h" +#include "video/csputils.h" #include "sub/sub.h" -#include "m_option.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" +#include "core/m_option.h" +#include "video/vfcap.h" +#include "video/mp_image.h" #include "osdep/timer.h" #include "bitmap_packer.h" diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 2358b0a295..f819a71a30 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -22,11 +22,11 @@ #include #include "config.h" -#include "video_out.h" +#include "vo.h" #include "aspect.h" -#include "csputils.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/vfcap.h" +#include "video/csputils.h" +#include "video/mp_image.h" +#include "video/vfcap.h" #include #include @@ -43,11 +43,11 @@ #include "sub/sub.h" -#include "libmpcodecs/sws_utils.h" +#include "video/sws_utils.h" #define MODE_RGB 0x1 #define MODE_BGR 0x2 -#include "mp_msg.h" +#include "core/mp_msg.h" extern int sws_flags; diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 3673764ed4..4019583914 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -41,18 +41,18 @@ #include #include -#include "options.h" +#include "core/options.h" #include "talloc.h" -#include "mp_msg.h" -#include "video_out.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" +#include "core/mp_msg.h" +#include "vo.h" +#include "video/vfcap.h" +#include "video/mp_image.h" #include "x11_common.h" -#include "fastmemcpy.h" +#include "video/memcpy_pic.h" #include "sub/sub.h" #include "aspect.h" -#include "csputils.h" -#include "subopt-helper.h" +#include "video/csputils.h" +#include "core/subopt-helper.h" static const vo_info_t info = { "X11/Xv", diff --git a/video/out/w32_common.c b/video/out/w32_common.c index f60f5328de..3edfa97595 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -22,14 +22,14 @@ #include #include -#include "options.h" -#include "input/keycodes.h" -#include "input/input.h" -#include "mp_msg.h" -#include "video_out.h" +#include "core/options.h" +#include "core/input/keycodes.h" +#include "core/input/input.h" +#include "core/mp_msg.h" +#include "vo.h" #include "aspect.h" #include "w32_common.h" -#include "mp_fifo.h" +#include "core/mp_fifo.h" #include "osdep/io.h" #include "talloc.h" @@ -577,7 +577,7 @@ int vo_w32_config(struct vo *vo, uint32_t width, uint32_t height, // first vo_config call; vo_config() will always set vo_dx/dy so // that the window is centered on the screen, and this is the only // time we actually want to use vo_dy/dy (this is not sane, and - // video_out.h should provide a function to query the initial + // vo.h should provide a function to query the initial // window position instead) w32->window_bounds_initialized = true; reset_size = true; diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 04d5c6880b..19094f24cd 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -23,10 +23,10 @@ #include #include "config.h" -#include "bstr.h" -#include "options.h" -#include "mp_msg.h" -#include "mp_fifo.h" +#include "core/bstr.h" +#include "core/options.h" +#include "core/mp_msg.h" +#include "core/mp_fifo.h" #include "libavutil/common.h" #include "x11_common.h" #include "talloc.h" @@ -35,7 +35,7 @@ #include #include -#include "video_out.h" +#include "vo.h" #include "aspect.h" #include "geometry.h" #include "osdep/timer.h" @@ -70,11 +70,11 @@ #include #include -#include "subopt-helper.h" +#include "core/subopt-helper.h" #endif -#include "input/input.h" -#include "input/keycodes.h" +#include "core/input/input.h" +#include "core/input/keycodes.h" #define WIN_LAYER_ONBOTTOM 2 #define WIN_LAYER_NORMAL 4 diff --git a/video/sws_utils.c b/video/sws_utils.c index 4fc5639e55..951e101066 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -20,13 +20,13 @@ #include -#include "libmpcodecs/sws_utils.h" +#include "sws_utils.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/img_format.h" +#include "video/mp_image.h" +#include "video/img_format.h" #include "fmt-conversion.h" -#include "libvo/csputils.h" -#include "mp_msg.h" +#include "csputils.h" +#include "core/mp_msg.h" //global sws_flags from the command line int sws_flags = 2; -- cgit v1.2.3