From 7d70f09307841b7dd4bb68d6b0a308a5fc2974f3 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 21 Nov 2018 19:07:33 +0100 Subject: [PATCH] avutil/avsscanf: do not use unsupported p suffix for hex variable --- libavutil/avsscanf.c | 4 +--- 1 file changed, 1 insertion(+), 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;