[SCM] libav/experimental: undefined M_PI / M_E fix

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:33:08 UTC 2013


The following commit has been merged in the experimental branch:
commit 471d7dc3d076bfb47bfb14bb8472abc92103e58b
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Aug 30 16:16:30 2002 +0000

    undefined M_PI / M_E fix
    
    Originally committed as revision 881 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 832af28..bcaf4f5 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -32,6 +32,10 @@
   #define NAN 0
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 #define STACK_SIZE 100
 
 typedef struct Parser{
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index fd55367..77af3c9 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -26,6 +26,14 @@
 #undef NDEBUG // allways check asserts, the speed effect is far too small to disable them
 #include <assert.h>
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifndef M_E
+#define M_E 2.718281828
+#endif
+
 static int init_pass2(MpegEncContext *s);
 static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_factor, int frame_num);
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list