virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avutil/libm: fix fminf() emulation build failure due to undefined FFMIN

Browse Source 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-06 20:25:04 +02:00
parent 049b20b287
commit e374e77292
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/libm.h
View File

@ -86,7 +86,9 @@ static av_always_inline float cbrtf(float x)
#undef fminf
static av_always_inline av_const float fminf(float x, float y)
{
return FFMIN(x, 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