[SCM] libav/experimental: Add casts to correct return type in macros for missing libm funcs

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7ed63ca2e7817e837facd29b01d25a1a69087916
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Feb 20 16:02:48 2010 +0000

    Add casts to correct return type in macros for missing libm funcs
    
    Originally committed as revision 21922 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 5091e1c..5e5a3fc 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

-- 
Libav/FFmpeg packaging