[SCM] libav/experimental: Remove MinGW lrint hack. It has been in mingw-runtime at least since version 2.4

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:03:28 UTC 2013


The following commit has been merged in the experimental branch:
commit 36564c514c79a17233e6285cd5ace43c3730b0d1
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Wed Jul 11 13:44:50 2007 +0000

    Remove MinGW lrint hack.
    It has been in mingw-runtime at least since version 2.4
    
    Originally committed as revision 9594 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/internal.h b/libavutil/internal.h
index ac0fcf7..842c260 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -270,21 +270,7 @@ if((y)<(x)){\
 /* btw, rintf() is existing on fbsd too -- alex */
 static av_always_inline long int lrintf(float x)
 {
-#ifdef __MINGW32__
-#  ifdef ARCH_X86_32
-    int32_t i;
-    asm volatile(
-        "fistpl %0\n\t"
-        : "=m" (i) : "t" (x) : "st"
-    );
-    return i;
-#  else
-    /* XXX: incorrect, but make it compile */
-    return (int)(x + (x < 0 ? -0.5 : 0.5));
-#  endif /* ARCH_X86_32 */
-#else
     return (int)(rint(x));
-#endif /* __MINGW32__ */
 }
 #endif /* HAVE_LRINTF */
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list