move M_PI definition along with other math definitions

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

move M_PI definition along with other math definitions
Originally committed as revision 14727 to svn://svn.ffmpeg.org/ffmpeg/trunk
5af4f1f3 · Aurelien Jacobs · af44e8e4 · 5af4f1f3 · 5af4f1f3 · 5af4f1f3
隐藏空白更改
内联并排

Showing with 4 addition and 5 deletion

libavutil/avutil.h libavutil/avutil.h +1 -1

libavutil/internal.h libavutil/internal.h +0 -4

libavutil/mathematics.h libavutil/mathematics.h +3 -0

未找到文件。
--- 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, \

--- 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

--- 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