summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
Diffstat (limited to 'video/out')
-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
23 files changed, 129 insertions, 133 deletions
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 <string.h>
#include <limits.h>
#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 <assert.h>
#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 <stdint.h>
#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 <GL/glext.h>
#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 <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
-#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 <sys/mman.h>
#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 <inttypes.h>
#include <stdbool.h>
-#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 <caca.h>
#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 <assert.h>
#include <d3d9.h>
#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 <libswscale/swscale.h>
#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 <stdio.h>
#include <stdlib.h>
-#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 <string.h>
#include <errno.h>
#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 <libavcodec/vdpau.h>
#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 <sys/types.h>
#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 <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -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 <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#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 <windows.h>
#include <windowsx.h>
-#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 <limits.h>
#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 <unistd.h>
#include <assert.h>
-#include "video_out.h"
+#include "vo.h"
#include "aspect.h"
#include "geometry.h"
#include "osdep/timer.h"
@@ -70,11 +70,11 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 17:55:55 +0000