From 85998f6121edb44672f51c4745fb243f3c567d3f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 19 Apr 2014 17:18:10 +0200
Subject: 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.
---
 video/filter/vf_divtc.c    |  1 -
 video/filter/vf_noise.c    |  3 ++-
 video/filter/vf_stereo3d.c |  3 ++-
 video/out/vo_direct3d.c    |  8 ++++----
 video/out/wayland_common.c |  1 -
 video/out/x11_common.c     | 10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'video')

diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 8e21df1f82..662106274c 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "common/msg.h"
 #include "options/m_option.h"
-#include "libavutil/common.h"
 #include "compat/mpbswap.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 178c1c1c8f..3046315219 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -24,6 +24,8 @@
 #include <inttypes.h>
 #include <math.h>
 
+#include <libavutil/mem.h>
+
 #include "config.h"
 #include "common/msg.h"
 #include "options/m_option.h"
@@ -32,7 +34,6 @@
 #include "video/mp_image.h"
 #include "vf.h"
 #include "video/memcpy_pic.h"
-#include "libavutil/mem.h"
 
 #include "vf_lavfi.h"
 
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index e809c54818..4126cd2f4e 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "common/msg.h"
 #include "options/options.h"
@@ -32,7 +34,6 @@
 #include "vf.h"
 #include "options/m_option.h"
 
-#include "libavutil/common.h"
 #include "video/memcpy_pic.h"
 
 #include "vf_lavfi.h"
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;
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index fa34efb949..7761380364 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -34,7 +34,6 @@
 #include "bstr/bstr.h"
 #include "options/options.h"
 #include "common/msg.h"
-#include "libavutil/common.h"
 #include "talloc.h"
 
 #include "wayland_common.h"
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index da8d878b6b..537e1124f1 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -25,10 +25,10 @@
 #include "config.h"
 #include "bstr/bstr.h"
 #include "options/options.h"
+#include "common/common.h"
 #include "common/msg.h"
 #include "input/input.h"
 #include "input/event.h"
-#include "libavutil/common.h"
 #include "x11_common.h"
 #include "talloc.h"
 
@@ -1419,10 +1419,10 @@ static void fill_rect(struct vo *vo, GC gc, int x0, int y0, int x1, int y1)
 {
     struct vo_x11_state *x11 = vo->x11;
 
-    x0 = FFMAX(x0, 0);
-    y0 = FFMAX(y0, 0);
-    x1 = FFMIN(x1, x11->win_width);
-    y1 = FFMIN(y1, x11->win_height);
+    x0 = MPMAX(x0, 0);
+    y0 = MPMAX(y0, 0);
+    x1 = MPMIN(x1, x11->win_width);
+    y1 = MPMIN(y1, x11->win_height);
 
     if (x11->window && x1 > x0 && y1 > y0)
         XFillRectangle(x11->display, x11->window, gc, x0, y0, x1 - x0, y1 - y0);
-- 
cgit v1.2.3