Mercurial > mplayer.hg

diff libaf/af_resample.c @ 36395:2b9bc3c2933d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some macros and switch to libavutil equivalents.
author reimar
date Sat, 26 Oct 2013 09:36:23 +0000
parents 6e78455a4b60
children
line wrap: on
line diff
--- a/libaf/af_resample.c	Sat Oct 26 09:36:21 2013 +0000
+++ b/libaf/af_resample.c	Sat Oct 26 09:36:23 2013 +0000
@@ -234,7 +234,7 @@
       s->i = 0;
 
       // Calculate cutoff frequency for filter
-      fc = 1/(float)(max(s->up,s->dn));
+      fc = 1/(float)(FFMAX(s->up,s->dn));
       // Allocate space for polyphase filter bank and prototype filter
       w = malloc(sizeof(float) * s->up *L);
       free(s->w);
@@ -277,7 +277,7 @@
     int sloppy=1;
     sscanf((char*)arg,"%i:%i:%i", &rate, &sloppy, &type);
     s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) |
-      (clamp(type,RSMP_LIN,RSMP_FLOAT));
+      (av_clip(type,RSMP_LIN,RSMP_FLOAT));
     return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate);
   }
   case AF_CONTROL_POST_CREATE: