Mercurial > mplayer.hg
changeset 30370:a8c94e9dc653
Don't redefine M_PI. It is already defined from libavutil/mathematics.h.
| author | ramiro |
|---|---|
| date | Sun, 24 Jan 2010 02:16:26 +0000 |
| parents | 8c479cb29c7a |
| children | 68143fd6b5d4 |
| files | libswscale/utils.c |
| diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/utils.c Sun Jan 24 02:08:22 2010 +0000 +++ b/libswscale/utils.c Sun Jan 24 02:16:26 2010 +0000 @@ -65,12 +65,6 @@ #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 @@ 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 @@ 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 @@ for (i=0; i<length; i++) { double dist= i-middle; - vec->coeff[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);