diff options
author | wm4 <wm4@nowhere> | 2013-10-26 15:05:59 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-10-26 15:05:59 +0200 |
commit | 7abc1bef40869d4efba88df8c5ad8b1ea4c49c57 (patch) | |
tree | ed1ef6c259c01dc119c4b99f84daefef5161bd93 /audio/filter/af_pan.c | |
parent | 74e7043cc756e171ea1a7fd4be01019c14e1e265 (diff) | |
download | mpv-7abc1bef40869d4efba88df8c5ad8b1ea4c49c57.tar.bz2 mpv-7abc1bef40869d4efba88df8c5ad8b1ea4c49c57.tar.xz |
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.
Diffstat (limited to 'audio/filter/af_pan.c')
-rw-r--r-- | audio/filter/af_pan.c | 9 |
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; } |