diff options
| author | Mans Rullgard <mans@mansr.com> | 2010-10-18 21:42:26 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-18 20:48:23 +0000 |
| commit | 324e7ee260b16d33a14c8a1a9909fa54bf1e996b (patch) | |
| tree | dc05e326f9fb2aca8e4f11ef07e4f0baa003c828 /libavutil | |
| parent | f318ee3e37bebb3f498edafdbaf7e164a889a357 (diff) | |
| download | ffmpeg-324e7ee260b16d33a14c8a1a9909fa54bf1e996b.tar.gz | |
Use INFINITY and NAN macros instead of 1/0 and 0/0
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/intfloat_readwrite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/intfloat_readwrite.c b/libavutil/intfloat_readwrite.c index 79fe18671e..d9b3752bb1 100644 --- a/libavutil/intfloat_readwrite.c +++ b/libavutil/intfloat_readwrite.c @@ -31,13 +31,13 @@ double av_int2dbl(int64_t v){ if(v+v > 0xFFEULL<<52) - return 0.0/0.0; + return NAN; return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075); } float av_int2flt(int32_t v){ if(v+v > 0xFF000000U) - return 0.0/0.0; + return NAN; return ldexp(((v&0x7FFFFF) + (1<<23)) * (v>>31|1), (v>>23&0xFF)-150); } @@ -49,7 +49,7 @@ double av_ext2dbl(const AVExtFloat ext){ m = (m<<8) + ext.mantissa[i]; e = (((int)ext.exponent[0]&0x7f)<<8) | ext.exponent[1]; if (e == 0x7fff && m) - return 0.0/0.0; + return NAN; e -= 16383 + 63; /* In IEEE 80 bits, the whole (i.e. 1.xxxx) * mantissa bit is written as opposed to the * single and double precision formats. */ @@ -88,7 +88,7 @@ AVExtFloat av_dbl2ext(double d){ ext.mantissa[i] = m>>(56-(i<<3)); } else if (f != 0.0) { ext.exponent[0] = 0x7f; ext.exponent[1] = 0xff; - if (f != 1/0.0) + if (f != INFINITY) ext.mantissa[0] = ~0; } if (d < 0) |