[FFmpeg-cvslog] avutil/libm: use FFMIN instead of fmin()

Michael Niedermayer git at videolan.org
Fri Jun 6 16:11:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 16:02:53 2014 +0200| [3133e7fd447513071b3075ae1a61f055003c3e34] | committer: Michael Niedermayer

avutil/libm: use FFMIN instead of fmin()

MSVC apparently doesnt support fmin() either

Suggested/Found-by: ubitux, Daemon404, nevcairiel
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3133e7fd447513071b3075ae1a61f055003c3e34
---

 libavutil/libm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/libm.h b/libavutil/libm.h
index 8f27fa3..eacb3cc 100644
--- a/libavutil/libm.h
+++ b/libavutil/libm.h
@@ -84,7 +84,7 @@ static av_always_inline float cbrtf(float x)
 
 #if !HAVE_FMINF
 #undef fminf
-#define fminf(x, y) ((float)fmin(x,y))
+#define fminf(x, y) (FFMIN(x,y))
 #endif
 
 #if !HAVE_ISINF



More information about the ffmpeg-cvslog mailing list