diff options
| author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
| commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
| tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /video/out/vo_opengl.c | |
| parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
| download | mpv-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/out/vo_opengl.c')
| -rw-r--r-- | video/out/vo_opengl.c | 18 |
1 files changed, 9 insertions, 9 deletions
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. |