Browse Source

Workaround for missing llrintf()

Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård 15 years ago
parent
commit
07876e25c8
3 changed files with 8 additions and 0 deletions
  1. 2 0
      configure
  2. 1 0
      libavcodec/audioconvert.c
  3. 5 0
      libavutil/libm.h

+ 2 - 0
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

+ 1 - 0
libavcodec/audioconvert.c

@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/libm.h"
 #include "avcodec.h"
 #include "audioconvert.h"
 

+ 5 - 0
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)