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_extrastereo.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_extrastereo.c')
| -rw-r--r-- | audio/filter/af_extrastereo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c index 75570c7648..4cf27f2724 100644 --- a/audio/filter/af_extrastereo.c +++ b/audio/filter/af_extrastereo.c @@ -26,6 +26,7 @@ #include <math.h> #include <limits.h> +#include "mpvcore/mp_common.h" #include "af.h" // Data for specific instances of this filter @@ -93,8 +94,8 @@ static struct mp_audio* play_s16(struct af_instance* af, struct mp_audio* data) l = avg + (int)(s->mul * (a[i] - avg)); r = avg + (int)(s->mul * (a[i + 1] - avg)); - a[i] = clamp(l, SHRT_MIN, SHRT_MAX); - a[i + 1] = clamp(r, SHRT_MIN, SHRT_MAX); + a[i] = MPCLAMP(l, SHRT_MIN, SHRT_MAX); + a[i + 1] = MPCLAMP(r, SHRT_MIN, SHRT_MAX); } return data; |