diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 00:12:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 00:43:09 +0400 |
| commit | 5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch) | |
| tree | 0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavutil/mathematics.h | |
| parent | 23eeffcd48a15e73fb2649b712870b6d101c5471 (diff) | |
| parent | 3893feeccdf754057fc7c7ac711ae876733f2f33 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt/eval: Include mathematics.h for NAN/INFINITY
mathematics: Don't use division by zero in NAN/INFINITY macros
wma: Lower the maximum number of channels to 2
x86: cpu: clean up check for cpuid instruction support
ARM: generate position independent code to access data symbols
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 93314bae16..5458d2f850 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_E #define M_E 2.7182818284590452354 /* e */ @@ -51,10 +52,10 @@ #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ #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 /** |