diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-19 22:49:04 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-19 22:49:04 +0000 |
| commit | 4e74187db2f5db52f88729efc662df9d6bc763e1 (patch) | |
| tree | 996692f4c32c6ca47c91a23e5f080c822db39817 | |
| parent | 8d2a5139dac63b07f9ef4e1142ee4a2b68bb1fad (diff) | |
Remove PI definition and use M_PI instead.
M_PI is defined by the included file libavutil/mathematics.h.
Originally committed as revision 31185 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 7 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 2b02dd3dfd..8868f5b1be 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -63,6 +63,7 @@ untested special converters #include "libavutil/intreadwrite.h" #include "libavutil/x86_cpu.h" #include "libavutil/avutil.h" +#include "libavutil/mathematics.h" #include "libavutil/bswap.h" #include "libavutil/pixdesc.h" @@ -77,12 +78,6 @@ untested special converters #define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit -#ifdef M_PI -#define PI M_PI -#else -#define PI 3.14159265358979323846 -#endif - #define isPacked(x) ( \ (x)==PIX_FMT_PAL8 \ || (x)==PIX_FMT_YUYV422 \ diff --git a/libswscale/utils.c b/libswscale/utils.c index d7a6ea25b0..5dad43bdd9 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -287,7 +287,7 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi } /* else if (flags & SWS_X) { double p= param ? param*0.01 : 0.3; - coeff = d ? sin(d*PI)/(d*PI) : 1.0; + coeff = d ? sin(d*M_PI)/(d*M_PI) : 1.0; coeff*= pow(2.0, - p*d*d); }*/ else if (flags & SWS_X) { |