From a1245d5ca1bed154a3bf38843b63018ae3544115 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 22 Jun 2012 13:05:21 +0300 Subject: mathematics: Don't use division by zero in NAN/INFINITY macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some compilers, MSVC among them, don't recognize the divisions by zero as meaning infinity/nan. These macros should, according to the standard, expand to constant expressions, but this shouldn't matter for our usage. Signed-off-by: Martin Storsjö --- libavutil/mathematics.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavutil/mathematics.h') diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h index a734b75c02..043dd0fafe 100644 --- a/libavutil/mathematics.h +++ b/libavutil/mathematics.h @@ -25,6 +25,7 @@ #include #include "attributes.h" #include "rational.h" +#include "intfloat.h" #ifndef M_LOG2_10 #define M_LOG2_10 3.32192809488736234787 /* log_2 10 */ @@ -33,10 +34,10 @@ #define M_PHI 1.61803398874989484820 /* phi / golden ratio */ #endif #ifndef NAN -#define NAN (0.0/0.0) +#define NAN av_int2float(0x7fc00000) #endif #ifndef INFINITY -#define INFINITY (1.0/0.0) +#define INFINITY av_int2float(0x7f800000) #endif /** -- cgit v1.2.3