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_channels.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_channels.c')
-rw-r--r-- | audio/filter/af_channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c index fc1a090f7f..27445aafe2 100644 --- a/audio/filter/af_channels.c +++ b/audio/filter/af_channels.c @@ -27,6 +27,7 @@ #include <string.h> #include <inttypes.h> +#include "mpvcore/mp_common.h" #include "af.h" #define FR 0 @@ -150,14 +151,14 @@ static int control(struct af_instance* af, int cmd, void* arg) // If mono: fake stereo if(((struct mp_audio*)arg)->nch == 1){ - s->nr = min(af->data->nch,2); + s->nr = MPMIN(af->data->nch,2); for(i=0;i<s->nr;i++){ s->route[i][FR] = 0; s->route[i][TO] = i; } } else{ - s->nr = min(af->data->nch, ((struct mp_audio*)arg)->nch); + s->nr = MPMIN(af->data->nch, ((struct mp_audio*)arg)->nch); for(i=0;i<s->nr;i++){ s->route[i][FR] = i; s->route[i][TO] = i; |