Mercurial > mplayer.hg

changeset 31128:100a50819c58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove PI definition and use M_PI instead. M_PI is defined by the included file libavutil/mathematics.h.
author stefano
date Wed, 19 May 2010 22:49:04 +0000
parents aab85e35de52
children 8639a950e856
files libswscale/swscale.c libswscale/utils.c
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Wed May 19 17:58:17 2010 +0000
+++ b/libswscale/swscale.c	Wed May 19 22:49:04 2010 +0000
@@ -63,6 +63,7 @@
 #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 @@
 
 #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     \
--- a/libswscale/utils.c	Wed May 19 17:58:17 2010 +0000
+++ b/libswscale/utils.c	Wed May 19 22:49:04 2010 +0000
@@ -287,7 +287,7 @@
                 }
 /*                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) {