Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavutil / libm.h

diff --git a/ffmpeg/libavutil/libm.h b/ffmpeg/libavutil/libm.h
index 28d5df871b39a1a8f99bc9540d7f9a8ccd840d59..6c17b287b450a7e2e676d0eb1b708be67dd04f83 100644 (file)
--- a/ffmpeg/libavutil/libm.h
+++ b/ffmpeg/libavutil/libm.h
@@ -82,16 +82,6 @@ static av_always_inline float cbrtf(float x)
 #define exp2f(x) ((float)exp2(x))
 #endif /* HAVE_EXP2F */
 
-#if !HAVE_FMINF
-#undef fminf
-static av_always_inline av_const float fminf(float x, float y)
-{
-    //Note, the NaN special case is needed for C spec compliance, it should be
-    //optimized away if the users compiler is configured to assume no NaN
-    return x > y ? y : (x == x ? x : y);
-}
-#endif
-
 #if !HAVE_ISINF
 static av_always_inline av_const int isinf(float x)
 {