aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-06 14:54:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-06 14:54:57 +0200
commit97508af274f89907bdacafb5ef10e839bb7d6bc4 (patch)
treec82b7f8f5f197f018656a5464fb0c54a0f1f2376
parenta80342fe5633303a72d357c0bd9419bf3962dfdb (diff)
downloadffmpeg-97508af274f89907bdacafb5ef10e839bb7d6bc4.tar.gz
build: add fminf() emulation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
-rw-r--r--libavutil/libm.h5
2 files changed, 7 insertions, 0 deletions
diff --git a/configure b/configure
index c504c85468..f15de0bb68 100755
--- a/configure
+++ b/configure
@@ -1645,6 +1645,7 @@ MATH_FUNCS="
exp2
exp2f
expf
+ fminf
isinf
isnan
ldexpf
@@ -4635,6 +4636,7 @@ disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersi
atan2f_args=2
ldexpf_args=2
powf_args=2
+fminf_args=2
for func in $MATH_FUNCS; do
eval check_mathfunc $func \${${func}_args:-1}
diff --git a/libavutil/libm.h b/libavutil/libm.h
index 6c17b287b4..9e0a64b4e5 100644
--- a/libavutil/libm.h
+++ b/libavutil/libm.h
@@ -82,6 +82,11 @@ static av_always_inline float cbrtf(float x)
#define exp2f(x) ((float)exp2(x))
#endif /* HAVE_EXP2F */
+#if !HAVE_FMINF
+#undef fminf
+#define fminf(x, y) ((float)fminf(x,y))
+#endif
+
#if !HAVE_ISINF
static av_always_inline av_const int isinf(float x)
{