Mercurial > mplayer.hg
diff libaf/af_center.c @ 36395:2b9bc3c2933d
Remove some macros and switch to libavutil equivalents.
author | reimar |
---|---|
date | Sat, 26 Oct 2013 09:36:23 +0000 |
parents | a93891202051 |
children |
line wrap: on
line diff
--- a/libaf/af_center.c Sat Oct 26 09:36:21 2013 +0000 +++ b/libaf/af_center.c Sat Oct 26 09:36:23 2013 +0000 @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -49,7 +50,7 @@ if(!arg) return AF_ERROR; af->data->rate = ((af_data_t*)arg)->rate; - af->data->nch = max(s->ch+1,((af_data_t*)arg)->nch); + af->data->nch = FFMAX(s->ch+1,((af_data_t*)arg)->nch); af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4;