From 6d92e5550203b04b7254eb8ffe31734e57070d79 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 31 Oct 2019 11:24:20 +0100
Subject: Replace uses of FFMIN/MAX with MPMIN/MAX

And remove libavutil includes where possible.
---
 stream/stream.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'stream/stream.c')

diff --git a/stream/stream.c b/stream/stream.c
index fb758f9b1d..063c033bd4 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -22,7 +22,6 @@
 #include <strings.h>
 #include <assert.h>
 
-#include <libavutil/common.h>
 #include "osdep/io.h"
 
 #include "mpv_talloc.h"
@@ -458,7 +457,7 @@ int stream_read_partial(stream_t *s, char *buf, int buf_size)
         if (!stream_fill_buffer(s))
             return 0;
     }
-    int len = FFMIN(buf_size, s->buf_len - s->buf_pos);
+    int len = MPMIN(buf_size, s->buf_len - s->buf_pos);
     memcpy(buf, &s->buffer[s->buf_pos], len);
     s->buf_pos += len;
     if (len > 0)
@@ -708,7 +707,7 @@ struct bstr stream_read_complete(struct stream *s, void *talloc_ctx,
             talloc_free(buf);
             return (struct bstr){NULL, 0};
         }
-        bufsize = FFMIN(bufsize + (bufsize >> 1), max_size + padding);
+        bufsize = MPMIN(bufsize + (bufsize >> 1), max_size + padding);
     }
     buf = talloc_realloc_size(talloc_ctx, buf, total_read + padding);
     memset(&buf[total_read], 0, padding);
-- 
cgit v1.2.3