[FFmpeg-cvslog] Revert "mathematics.h: remove a couple of math defines"
Carl Eugen Hoyos
git at videolan.org
Fri Jun 22 16:50:24 CEST 2012
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Jun 22 16:10:42 2012 +0200| [15bde060844b7d32af80b352834ba5f33cab55d1] | committer: Carl Eugen Hoyos
Revert "mathematics.h: remove a couple of math defines"
This reverts commit a2b186a188c126dd0402414d9e8198ec4df63ebe.
The defines were present for several years, removing
them without a version bump may break API.
(Fixes MPlayer compilation.)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15bde060844b7d32af80b352834ba5f33cab55d1
---
libavutil/mathematics.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
index 844747e..93314ba 100644
--- a/libavutil/mathematics.h
+++ b/libavutil/mathematics.h
@@ -26,12 +26,30 @@
#include "attributes.h"
#include "rational.h"
+#ifndef M_E
+#define M_E 2.7182818284590452354 /* e */
+#endif
+#ifndef M_LN2
+#define M_LN2 0.69314718055994530942 /* log_e 2 */
+#endif
+#ifndef M_LN10
+#define M_LN10 2.30258509299404568402 /* log_e 10 */
+#endif
#ifndef M_LOG2_10
#define M_LOG2_10 3.32192809488736234787 /* log_2 10 */
#endif
#ifndef M_PHI
#define M_PHI 1.61803398874989484820 /* phi / golden ratio */
#endif
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 /* pi */
+#endif
+#ifndef M_SQRT1_2
+#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
+#endif
+#ifndef M_SQRT2
+#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
+#endif
#ifndef NAN
#define NAN (0.0/0.0)
#endif
More information about the ffmpeg-cvslog
mailing list