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_center.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_center.c')
| -rw-r--r-- | audio/filter/af_center.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/filter/af_center.c b/audio/filter/af_center.c index e04b5ceced..0cfdbc3b0e 100644 --- a/audio/filter/af_center.c +++ b/audio/filter/af_center.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> +#include "mpvcore/mp_common.h" #include "af.h" // Data for specific instances of this filter @@ -48,7 +49,7 @@ static int control(struct af_instance* af, int cmd, void* arg) if(!arg) return AF_ERROR; af->data->rate = ((struct mp_audio*)arg)->rate; - mp_audio_set_channels_old(af->data, max(s->ch+1,((struct mp_audio*)arg)->nch)); + mp_audio_set_channels_old(af->data, MPMAX(s->ch+1,((struct mp_audio*)arg)->nch)); mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE); return af_test_output(af,(struct mp_audio*)arg); |