From 0ae7ed631b3cd13d19ae01bb7cb1165befb97410 Mon Sep 17 00:00:00 2001 From: ramiro Date: Sun, 24 Jan 2010 02:16:26 +0000 Subject: Don't redefine M_PI. It is already defined from libavutil/mathematics.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30412 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/utils.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 1a7a36454b..b2347087b2 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -65,12 +65,6 @@ const char *swscale_license(void) #define RET 0xC3 //near return opcode for x86 -#ifdef M_PI -#define PI M_PI -#else -#define PI 3.14159265358979323846 -#endif - #define isSupportedIn(x) ( \ (x)==PIX_FMT_YUV420P \ || (x)==PIX_FMT_YUVA420P \ @@ -299,7 +293,7 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi double c; if (floatd<1.0) - c = cos(floatd*PI); + c = cos(floatd*M_PI); else c=-1.0; if (c<0.0) c= -pow(-c, A); @@ -315,10 +309,10 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0; coeff = (pow(2.0, - p*floatd*floatd))*fone; } else if (flags & SWS_SINC) { - coeff = (d ? sin(floatd*PI)/(floatd*PI) : 1.0)*fone; + coeff = (d ? sin(floatd*M_PI)/(floatd*M_PI) : 1.0)*fone; } else if (flags & SWS_LANCZOS) { double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0; - coeff = (d ? sin(floatd*PI)*sin(floatd*PI/p)/(floatd*floatd*PI*PI/p) : 1.0)*fone; + coeff = (d ? sin(floatd*M_PI)*sin(floatd*M_PI/p)/(floatd*floatd*M_PI*M_PI/p) : 1.0)*fone; if (floatd>p) coeff=0; } else if (flags & SWS_BILINEAR) { coeff= (1<<30) - d; @@ -1287,7 +1281,7 @@ SwsVector *sws_getGaussianVec(double variance, double quality) for (i=0; icoeff[i]= exp(-dist*dist/(2*variance*variance)) / sqrt(2*variance*PI); + vec->coeff[i]= exp(-dist*dist/(2*variance*variance)) / sqrt(2*variance*M_PI); } sws_normalizeVec(vec, 1.0); -- cgit v1.2.3