[PATCH 1/5] Remove PI definition and use M_PI instead.

Stefano Sabatini stefano.sabatini-lala
Tue May 18 23:54:46 CEST 2010


M_PI is defined by the included file libavutil/mathematics.h.
---
 swscale.c |    7 +------
 utils.c   |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/swscale.c b/swscale.c
index 2b02dd3..8868f5b 100644
--- a/swscale.c
+++ b/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/utils.c b/utils.c
index d7a6ea2..5dad43b 100644
--- a/utils.c
+++ b/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) {
-- 
1.7.0


--xXmbgvnjoT4axfJE--



More information about the ffmpeg-devel mailing list