Workaround for missing llrintf()

Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 02ea987755b187d137c7ef8bdc725b96fecfef19..0b76e8b66909fbaf1f88c57f214c0f08d266e2e1 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index a38d87351f1e686cbdf1d5350060dee514368fee..d022bc9ee3ee610293ecc564d304f5fe715ddce9 100644 (file)
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/libm.h"
 #include "avcodec.h"
 #include "audioconvert.h"
 

diff --git a/libavutil/libm.h b/libavutil/libm.h
index db014a9066d89ce7c7505a364f7aa210969f8410..c7c28ac27c805cc8a6e833e1347ac8458b465522 100644 (file)
--- a/libavutil/libm.h
+++ b/libavutil/libm.h
@@ -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)