X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ffmpeg%2Flibavutil%2Flibm.h;h=6c17b287b450a7e2e676d0eb1b708be67dd04f83;hb=refs%2Ftags%2Fdebian%2F2.5.0_trusty1.1;hp=28d5df871b39a1a8f99bc9540d7f9a8ccd840d59;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00;p=deb_ffmpeg.git diff --git a/ffmpeg/libavutil/libm.h b/ffmpeg/libavutil/libm.h index 28d5df8..6c17b28 100644 --- 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) {