aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-11-08 10:48:37 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-11-08 11:31:11 +0100
commit4436a8f44dedc83767b3d9da9beb85d1fae2ca30 (patch)
tree0a2f799e2889295fa5a476772775215a1afb4ea2 /libavutil
parent4342b346d273366438f10a1cc665d0c2db2af469 (diff)
downloadffmpeg-4436a8f44dedc83767b3d9da9beb85d1fae2ca30.tar.gz
Remove fminf() emulation.
The emulation is unused and causes compilation trouble on systems where fminf() is defined in <math.h> but missing from libm. This should fix compilation on Debian powerpcspe.
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/libm.h10
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)
{