From patchwork Wed Nov 21 18:08:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11109 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C7BC344D531 for ; Wed, 21 Nov 2018 20:13:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4362D689EE5; Wed, 21 Nov 2018 20:13:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7E8E689D30 for ; Wed, 21 Nov 2018 20:13:47 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id q18so6677901wrx.9 for ; Wed, 21 Nov 2018 10:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=7S7EJrKVMYPkqalEsCP0z2tbJ1iYheLJAuLVATXCXMM=; b=KXvQyjq5x952IqDMNuA98XbqDJgsvwAxEygHsUsUSPhUEzO7iRkDSV+dtfHMv4FyTs icWyCGgEkixfc/up5wdW2FBxKUmpdnMoSRYF+AVECCwVkQZl1awIy//d/wkQCsS3Bd/D /2xmJh05uc/MDlWVZVqNkM0AMFV6j2RAjGnCbbeByaJKfulpl/AcSlf5NCJp+2w3mQ9X IeLZT9R2aQ2mBI7EO9L/u7qEWIxxiHtucbg5asjk427RWIWKMMz/5Ac0DayhyutvtljF /kDS8UN549bENl/RBEDGE+L/etLh4Sio9WyPaE8flLi+odicDHeosF1s0LoluLZpzqDv axfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=7S7EJrKVMYPkqalEsCP0z2tbJ1iYheLJAuLVATXCXMM=; b=Ia9ZT4DdV0R/orsCpXKpuKpf5gDFuVfcgeHuw2O22IydSMi1p03+jBImAN516iOjhZ tThK2yfH3msUaxl7koWGKsqkGxNCyBysJFpQbbrNn/Z1genMzfXcNExf+4VlNQWd+SqC 7XDgaESLfKJat4SKuomNBp0+JIi+H8uT53oHNZ+SqnJlkUVQb1BSQZReduGbKsLL51Xz caUQp6cApMia6ikAYlv7d0w52Xl9qryEYMmfrGT3odU4QfxXH0FdxEa1mpP+Gzmv+qex jMl1vdutpaBr8HOMQaV7fa6ZGRXs4OCB7iOWo7pur4ceb1bBUlX2ibpSIP6ByLErIP/Y y08w== X-Gm-Message-State: AA+aEWaEw1eprKx/fgROpiW/jskAM5ExJPuBXPPK31oa+31rbHag5ZRD isxx/16/izBa0ZYBFqU2+xHamtSe X-Google-Smtp-Source: AFSGD/UDTgiso7fNvUHvTpT0IGnv2xiKH+T+vj/2BztAyB6NLT0TtbpGUvGPG6wxKjCj8Pq6ITDj4A== X-Received: by 2002:adf:fa05:: with SMTP id m5mr2843853wrr.155.1542823716220; Wed, 21 Nov 2018 10:08:36 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id y138sm2285882wmc.16.2018.11.21.10.08.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 10:08:35 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Nov 2018 19:08:26 +0100 Message-Id: <20181121180826.22310-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avutil/avsscanf: do not use unsupported p suffig for hex variable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- 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;