summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-09 01:06:43 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:08:18 +0100
commit4873b32c5959c988af1769529ff72e3fd62fba82 (patch)
treee18fbd7eef54de6071969689aa5c31d6ea1f0963 /video
parentd4bdd0473d6f43132257c9fb3848d829755167a3 (diff)
downloadmpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2
mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz
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.)
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c22
-rw-r--r--video/decode/dec_video.h2
-rw-r--r--video/decode/vd.c16
-rw-r--r--video/decode/vd.h6
-rw-r--r--video/decode/vd_lavc.c22
-rw-r--r--video/filter/pullup.c4
-rw-r--r--video/filter/vf.c12
-rw-r--r--video/filter/vf.h11
-rw-r--r--video/filter/vf_crop.c12
-rw-r--r--video/filter/vf_delogo.c14
-rw-r--r--video/filter/vf_divtc.c12
-rw-r--r--video/filter/vf_dlopen.c10
-rw-r--r--video/filter/vf_down3dright.c10
-rw-r--r--video/filter/vf_dsize.c6
-rw-r--r--video/filter/vf_eq2.c8
-rw-r--r--video/filter/vf_expand.c14
-rw-r--r--video/filter/vf_flip.c6
-rw-r--r--video/filter/vf_format.c10
-rw-r--r--video/filter/vf_gradfun.c14
-rw-r--r--video/filter/vf_hqdn3d.c6
-rw-r--r--video/filter/vf_ilpack.c8
-rw-r--r--video/filter/vf_mirror.c6
-rw-r--r--video/filter/vf_noformat.c10
-rw-r--r--video/filter/vf_noise.c10
-rw-r--r--video/filter/vf_phase.c8
-rw-r--r--video/filter/vf_pp.c8
-rw-r--r--video/filter/vf_pullup.c10
-rw-r--r--video/filter/vf_rotate.c6
-rw-r--r--video/filter/vf_scale.c22
-rw-r--r--video/filter/vf_screenshot.c12
-rw-r--r--video/filter/vf_softpulldown.c8
-rw-r--r--video/filter/vf_stereo3d.c14
-rw-r--r--video/filter/vf_sub.c16
-rw-r--r--video/filter/vf_swapuv.c6
-rw-r--r--video/filter/vf_unsharp.c10
-rw-r--r--video/filter/vf_vo.c8
-rw-r--r--video/filter/vf_yadif.c12
-rw-r--r--video/fmt-conversion.c4
-rw-r--r--video/image_writer.c15
-rw-r--r--video/img_format.c4
-rw-r--r--video/img_format.h2
-rw-r--r--video/mp_image.c8
-rw-r--r--video/mp_image.h4
-rw-r--r--video/out/aspect.c8
-rw-r--r--video/out/bitmap_packer.c6
-rw-r--r--video/out/cocoa_common.h2
-rw-r--r--video/out/cocoa_common.m12
-rw-r--r--video/out/geometry.c2
-rw-r--r--video/out/gl_common.c3
-rw-r--r--video/out/gl_common.h10
-rw-r--r--video/out/osx_common.c9
-rw-r--r--video/out/vo.c16
-rw-r--r--video/out/vo.h4
-rw-r--r--video/out/vo_caca.c14
-rw-r--r--video/out/vo_corevideo.m11
-rw-r--r--video/out/vo_direct3d.c18
-rw-r--r--video/out/vo_image.c21
-rw-r--r--video/out/vo_lavc.c16
-rw-r--r--video/out/vo_null.c8
-rw-r--r--video/out/vo_opengl.c18
-rw-r--r--video/out/vo_opengl_old.c12
-rw-r--r--video/out/vo_vdpau.c14
-rw-r--r--video/out/vo_x11.c12
-rw-r--r--video/out/vo_xv.c16
-rw-r--r--video/out/w32_common.c14
-rw-r--r--video/out/x11_common.c16
-rw-r--r--video/sws_utils.c10
67 files changed, 348 insertions, 352 deletions
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 <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
-#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 <string.h>
#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 <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/