move M_PI definition along with other math definitions

Originally committed as revision 14727 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 6b5096e58bc6fb4db7b0aa01a6b817c57b48b872..3203ca2875c57bf1471c4638b1d98b269e4aa98d 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -35,7 +35,7 @@
 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
 
 #define LIBAVUTIL_VERSION_MAJOR 49
-#define LIBAVUTIL_VERSION_MINOR  8
+#define LIBAVUTIL_VERSION_MINOR  9
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 4832ef1b220c993ac0b1448805bb6f7434033809..71a353ecda4082106d46059ec5837abeb0d6c72e 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -50,10 +50,6 @@
 #endif
 #endif
 
-#ifndef M_PI
-#define M_PI    3.14159265358979323846
-#endif
-
 #ifndef INT16_MIN
 #define INT16_MIN       (-0x7fff-1)
 #endif

diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
index 244baca0207b124f8a7a60e21f30a1e08d07e570..79d3f76ab6eea6ce2a487cb48551bcdd9a54e1d5 100644 (file)
--- a/libavutil/mathematics.h
+++ b/libavutil/mathematics.h
@@ -34,6 +34,9 @@
 #ifndef M_LN10
 #define M_LN10         2.30258509299404568402  /* log_e 10 */
 #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