diff options
author | wm4 <wm4@nowhere> | 2014-04-19 17:18:10 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-04-19 17:18:10 +0200 |
commit | 85998f6121edb44672f51c4745fb243f3c567d3f (patch) | |
tree | 64ff8dd5ed267b9d8e51330ead013ca7ff141564 /video/out/vo_direct3d.c | |
parent | 0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87 (diff) | |
download | mpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.bz2 mpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.xz |
Fix some libav* include statements
Fix all include statements of the form:
#include "libav.../..."
These come from MPlayer times, when FFmpeg was somehow part of the
MPlayer build tree, and this form was needed to prefer the local files
over system FFmpeg.
In some cases, the include statement wasn't needed or could be replaced
with mpv defined symbols.
Diffstat (limited to 'video/out/vo_direct3d.c')
-rw-r--r-- | video/out/vo_direct3d.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index d4100066d5..6770cba1c1 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -38,8 +38,8 @@ #include "video/img_format.h" #include "video/memcpy_pic.h" #include "common/msg.h" +#include "common/common.h" #include "w32_common.h" -#include "libavutil/common.h" #include "sub/osd.h" #include "bitmap_packer.h" @@ -303,8 +303,8 @@ static void d3d_fix_texture_size(d3d_priv *priv, int *width, int *height) int tex_height = *height; // avoid nasty special cases with 0-sized textures and texture sizes - tex_width = FFMAX(tex_width, 1); - tex_height = FFMAX(tex_height, 1); + tex_width = MPMAX(tex_width, 1); + tex_height = MPMAX(tex_height, 1); if (priv->device_caps_power2_only) { tex_width = 1; @@ -314,7 +314,7 @@ static void d3d_fix_texture_size(d3d_priv *priv, int *width, int *height) } if (priv->device_caps_square_only) /* device only supports square textures */ - tex_width = tex_height = FFMAX(tex_width, tex_height); + tex_width = tex_height = MPMAX(tex_width, tex_height); // better round up to a multiple of 16 if (!priv->opt_disable_texture_align) { tex_width = (tex_width + 15) & ~15; |