[SCM] libav/experimental: Define missing llrint() as macro instead of inline function

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:43 UTC 2013


The following commit has been merged in the experimental branch:
commit 8e05f06912e2bb39c77609e4d9161bfb46ea8fde
Author: Måns Rullgård <mans at mansr.com>
Date:   Tue Feb 9 22:55:16 2010 +0000

    Define missing llrint() as macro instead of inline function
    
    This fixes building on some broken systems.
    
    Originally committed as revision 21735 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/internal.h b/libavutil/internal.h
index cd63b3d..d22b4e6 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -225,10 +225,8 @@ static inline av_const unsigned int ff_sqrt(unsigned int a)
 #endif /* HAVE_EXP2F */
 
 #if !HAVE_LLRINT
-static av_always_inline av_const long long llrint(double x)
-{
-    return rint(x);
-}
+#undef llrint
+#define llrint(x) rint(x)
 #endif /* HAVE_LLRINT */
 
 #if !HAVE_LOG2

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list