aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-13 16:01:21 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-13 16:01:21 +0000
commit5af4f1f3e3d8a219aa2f0b57e2b8152cea31aaf3 (patch)
tree44ba6d3d2122ee89709435e5df9dc121cd8ae434
parentaf44e8e4886017ba84fb1e03d495dfb37989f0bf (diff)
downloadffmpeg-5af4f1f3e3d8a219aa2f0b57e2b8152cea31aaf3.tar.gz
move M_PI definition along with other math definitions
Originally committed as revision 14727 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavutil/avutil.h2
-rw-r--r--libavutil/internal.h4
-rw-r--r--libavutil/mathematics.h3
3 files changed, 4 insertions, 5 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 6b5096e58b..3203ca2875 100644
--- 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 4832ef1b22..71a353ecda 100644
--- 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 244baca020..79d3f76ab6 100644
--- 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