aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-02-20 16:02:48 +0000
committerMåns Rullgård <mans@mansr.com>2010-02-20 16:02:48 +0000
commit7ed63ca2e7817e837facd29b01d25a1a69087916 (patch)
tree6620685f9c88ec4571d4c3eff384ba735e9a0e0a /libavutil
parentda2a5feaeaf8ec9efaf9bb708c6d23eb776446e5 (diff)
downloadffmpeg-7ed63ca2e7817e837facd29b01d25a1a69087916.tar.gz
Add casts to correct return type in macros for missing libm funcs
Originally committed as revision 21922 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/internal.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 5091e1ce11..5e5a3fc897 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -221,12 +221,12 @@ static inline av_const unsigned int ff_sqrt(unsigned int a)
#if !HAVE_EXP2F
#undef exp2f
-#define exp2f(x) exp2(x)
+#define exp2f(x) ((float)exp2(x))
#endif /* HAVE_EXP2F */
#if !HAVE_LLRINT
#undef llrint
-#define llrint(x) rint(x)
+#define llrint(x) ((long long)rint(x))
#endif /* HAVE_LLRINT */
#if !HAVE_LOG2
@@ -236,7 +236,7 @@ static inline av_const unsigned int ff_sqrt(unsigned int a)
#if !HAVE_LOG2F
#undef log2f
-#define log2f(x) log2(x)
+#define log2f(x) ((float)log2(x))
#endif /* HAVE_LOG2F */
#if !HAVE_LRINT