From 0931cff1e94009480444f6e9f26f330b9ac8a4ad Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 22 Jan 2014 00:30:40 +0100
Subject: aspect: remove a small ffmpeg dependency

Not strictly needed, but probably saves us pain the next time
ffmpeg mess up their headers.
---
 video/out/aspect.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'video')

diff --git a/video/out/aspect.c b/video/out/aspect.c
index 38a683a13e..1439f5a5db 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -16,8 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <libavutil/common.h>
-
 /* Stuff for correct aspect scaling. */
 #include "aspect.h"
 #include "vo.h"
@@ -62,8 +60,8 @@ static void aspect_calc_panscan(struct mp_log *log, struct mp_vo_opts *opts,
 // Clamp [start, end) to range [0, size) with various fallbacks.
 static void clamp_size(int size, int *start, int *end)
 {
-    *start = FFMAX(0, *start);
-    *end = FFMIN(size, *end);
+    *start = MPMAX(0, *start);
+    *end = MPMIN(size, *end);
     if (*start >= *end) {
         *start = 0;
         *end = 1;
-- 
cgit v1.2.3