diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 12:26:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 12:26:55 +0100 |
| commit | b0ed88b4c0e9c98881e2db77b697e352fd78e7b4 (patch) | |
| tree | 5a9b065d713b191897301002347f57141f1babfa /libavutil | |
| parent | 9ebfe38f3873eafacff9b0933cbf9b97198ec020 (diff) | |
| parent | 4436a8f44dedc83767b3d9da9beb85d1fae2ca30 (diff) | |
| download | ffmpeg-b0ed88b4c0e9c98881e2db77b697e352fd78e7b4.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Remove fminf() emulation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/libm.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavutil/libm.h b/libavutil/libm.h index 28d5df871b..6c17b287b4 100644 --- a/libavutil/libm.h +++ b/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) { |