[FFmpeg-cvslog] r22954 - in trunk: configure libavcodec/audioconvert.c libavutil/libm.h

[mru]

Author: mru
Date: Fri Apr 23 18:28:10 2010
New Revision: 22954

Log:
Workaround for missing llrintf()

Modified:
   trunk/configure
   trunk/libavcodec/audioconvert.c
   trunk/libavutil/libm.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Apr 23 15:15:11 2010	(r22953)
+++ trunk/configure	Fri Apr 23 18:28:10 2010	(r22954)
@@ -1052,6 +1052,7 @@ HAVE_LIST="
     libdc1394_1
     libdc1394_2
     llrint
+    llrintf
     local_aligned_16
     local_aligned_8
     log2
@@ -2585,6 +2586,7 @@ check_lib va/va.h vaInitialize -lva
 check_mathfunc exp2
 check_mathfunc exp2f
 check_mathfunc llrint
+check_mathfunc llrintf
 check_mathfunc log2
 check_mathfunc log2f
 check_mathfunc lrint

Modified: trunk/libavcodec/audioconvert.c
==============================================================================
--- trunk/libavcodec/audioconvert.c	Fri Apr 23 15:15:11 2010	(r22953)
+++ trunk/libavcodec/audioconvert.c	Fri Apr 23 18:28:10 2010	(r22954)
@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/libm.h"
 #include "avcodec.h"
 #include "audioconvert.h"
 

Modified: trunk/libavutil/libm.h
==============================================================================
--- trunk/libavutil/libm.h	Fri Apr 23 15:15:11 2010	(r22953)
+++ trunk/libavutil/libm.h	Fri Apr 23 18:28:10 2010	(r22954)
@@ -43,6 +43,11 @@
 #define llrint(x) ((long long)rint(x))
 #endif /* HAVE_LLRINT */
 
+#if !HAVE_LLRINTF
+#undef llrintf
+#define llrintf(x) ((long long)rint(x))
+#endif /* HAVE_LLRINT */
+
 #if !HAVE_LOG2
 #undef log2
 #define log2(x) (log(x) * 1.44269504088896340736)