[FFmpeg-cvslog] r21922 - trunk/libavutil/internal.h

mru subversion
Sat Feb 20 17:02:48 CET 2010


Author: mru
Date: Sat Feb 20 17:02:48 2010
New Revision: 21922

Log:
Add casts to correct return type in macros for missing libm funcs

Modified:
   trunk/libavutil/internal.h

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	Sat Feb 20 16:39:27 2010	(r21921)
+++ trunk/libavutil/internal.h	Sat Feb 20 17:02:48 2010	(r21922)
@@ -221,12 +221,12 @@ static inline av_const unsigned int ff_s
 
 #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_s
 
 #if !HAVE_LOG2F
 #undef log2f
-#define log2f(x) log2(x)
+#define log2f(x) ((float)log2(x))
 #endif /* HAVE_LOG2F */
 
 #if !HAVE_LRINT



More information about the ffmpeg-cvslog mailing list