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.
---
 audio/out/ao_lavc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'audio/out')

diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 974d9d0b63..0973d9f529 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -146,7 +146,7 @@ static int init(struct ao *ao)
     // enough frames for at least 0.25 seconds
     ac->framecount = ceil(ao->samplerate * 0.25 / ac->aframesize);
     // but at least one!
-    ac->framecount = FFMAX(ac->framecount, 1);
+    ac->framecount = MPMAX(ac->framecount, 1);
 
     ac->savepts = AV_NOPTS_VALUE;
     ac->lastpts = AV_NOPTS_VALUE;
@@ -324,7 +324,7 @@ static int play(struct ao *ao, void **data, int samples, int flags)
 
     talloc_free(tempdata);
 
-    int taken = FFMIN(bufpos, orig_samples);
+    int taken = MPMIN(bufpos, orig_samples);
     ectx->samples_since_last_pts += taken;
 
     pthread_mutex_unlock(&ectx->lock);
-- 
cgit v1.2.3