summaryrefslogtreecommitdiff
path: root/libavutil/avsscanf.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2018-11-21 19:07:33 +0100
committerPaul B Mahol <onemda@gmail.com>2018-11-22 10:09:05 +0100
commit7d70f09307841b7dd4bb68d6b0a308a5fc2974f3 (patch)
tree05cc007699e0464940bf2fb7af95ee83827aa0b3 /libavutil/avsscanf.c
parentce0a7536340518b20131c377788866e3030dfc6d (diff)
avutil/avsscanf: do not use unsupported p suffix for hex variable
Diffstat (limited to 'libavutil/avsscanf.c')
-rw-r--r--libavutil/avsscanf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index 8fc9c5956b..360170c9a9 100644
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -241,8 +241,6 @@ static long long scanexp(FFFILE *f, int pok)
#define LD_B1B_MAX 9007199, 254740991
#define KMAX 128
#define MASK (KMAX-1)
-#define CONCAT2(x,y) x ## y
-#define CONCAT(x,y) CONCAT2(x,y)
static double decfloat(FFFILE *f, int c, int bits, int emin, int sign, int pok)
{
@@ -483,7 +481,7 @@ static double decfloat(FFFILE *f, int c, int bits, int emin, int sign, int pok)
y -= bias;
if ((e2+DBL_MANT_DIG & INT_MAX) > emax-5) {
- if (fabs(y) >= CONCAT(0x1p, DBL_MANT_DIG)) {
+ if (fabs(y) >= pow(2, DBL_MANT_DIG)) {
if (denormal && bits==DBL_MANT_DIG+e2-emin)
denormal = 0;
y *= 0.5;