diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-22 13:05:21 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-01 19:06:13 +0300 |
| commit | a1245d5ca1bed154a3bf38843b63018ae3544115 (patch) | |
| tree | 2ef57f9ac6df7f6e8e2511d2d5a62e720d9feb97 /libavutil/mathematics.h | |
| parent | 710bd8a33e9c183ded4a61d742d404d8d5d838ea (diff) | |
mathematics: Don't use division by zero in NAN/INFINITY macros
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ö <martin@martin.st>
Diffstat (limited to 'libavutil/mathematics.h')
| -rw-r--r-- | libavutil/mathematics.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 <math.h> #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 /** |