af: replace macros with too generic names

Defining names like min, max etc. in an often used header is not really
a good idea.

Somewhat similar to MPlayer svn commit 36491, but don't use libavutil,
because that typically causes us sorrow.

1 files changed, 5 insertions, 4 deletions

diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c
index bbd754647a..b3e31dab98 100644
--- a/audio/filter/af_pan.c
+++ b/audio/filter/af_pan.c
@@ -25,6 +25,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include "mpvcore/mp_common.h"
 #include "af.h"
 
 // Data for specific instances of this filter
@@ -126,10 +127,10 @@ static int control(struct af_instance* af, int cmd, void* arg)
     if (s->nch)
       return AF_ERROR;
     if (af->data->nch >= 2) {
-      s->level[0][0] = min(1.f, 1.f - val);
-      s->level[0][1] = max(0.f, val);
-      s->level[1][0] = max(0.f, -val);
-      s->level[1][1] = min(1.f, 1.f + val);
+      s->level[0][0] = MPMIN(1.f, 1.f - val);
+      s->level[0][1] = MPMAX(0.f, val);
+      s->level[1][0] = MPMAX(0.f, -val);
+      s->level[1][1] = MPMIN(1.f, 1.f + val);
     }
     return AF_OK;
   }