From fa30dc415419a6a22d31f79095e0a0d41bc61905 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 16 Jun 2013 22:52:49 +0200
Subject: cache: fix compilation on Libav

Appears Libav doesn't have av_clip64(). So implement our own.
---
 stream/cache.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'stream')

diff --git a/stream/cache.c b/stream/cache.c
index 39c0701848..5a34447701 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -119,6 +119,13 @@ enum {
     CACHE_CTRL_PING = -2,
 };
 
+static int64_t mp_clipi64(int64_t val, int64_t min, int64_t max)
+{
+    val = FFMIN(val, max);
+    val = FFMAX(val, min);
+    return val;
+}
+
 // pthread_cond_timedwait() with a relative timeout in seconds
 static int cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
                            double timeout)
@@ -229,7 +236,7 @@ static bool cache_fill(struct priv *s)
     }
 
     // number of buffer bytes which should be preserved in backwards direction
-    int64_t back = av_clip64(read - s->min_filepos, 0, s->back_size);
+    int64_t back = mp_clipi64(read - s->min_filepos, 0, s->back_size);
 
     // number of buffer bytes that are valid and can be read
     int64_t newb = FFMAX(s->max_filepos - read, 0);
-- 
cgit v1.2.3