From patchwork Tue Oct 6 00:17:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22731 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 64191440240 for ; Tue, 6 Oct 2020 03:25:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39BD268B368; Tue, 6 Oct 2020 03:25:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C75A768B368 for ; Tue, 6 Oct 2020 03:24:56 +0300 (EEST) Received: by mail-ed1-f67.google.com with SMTP id k14so11511048edo.1 for ; Mon, 05 Oct 2020 17:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=YJdSqtxUEX4WxNoWoyLp6I9uAAHcD14+ofW7HRXg2yU=; b=vaLueIwSkmEUUMEWY6zD9UoyC8XlS7vv6adfhQZDNZ6C6C4yY9kyqP2XhdqlAcIRF/ NlEZFeiTF8P3cDlpTURHQOelFbbxABn8h+fCrX5Tss6AGTdKcg5OpBMQzOV4OfFsAFtA EsTxq05Nj9iis5VMAE94f6ruWPHa64NIRkKIgdoISVKaIULsJXQIPOl6al37/ElSO2ID SnhTYysRuI4ME445DrjYoisTsfo2kFS8LmyOIm0Atx/W5n6Q7WKQx0PNBdxuZOTVj6au dRW5ZMJfOi3H3qd1LGr9UOqMJyVMDxEiPRUkhivnsU8zlmv1rqqCxb2JeG+MeBj5KEaD 8kDA== 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:in-reply-to :references; bh=YJdSqtxUEX4WxNoWoyLp6I9uAAHcD14+ofW7HRXg2yU=; b=MUlMOfUT0DXm6Hk/mOQzv93/8Cb1O1+zBtvBEh/ndyE3rDPVPW39CLuRRzGPSa5nnA NW9dAg5AXtPeKyOSQIgDtglDx9kAmCEvB0pqtKVfbQAWl7uvXoEnA8y8aOWefIRF6SqA hNNAmK1PT3eC03T9Z1ihJ8+LiE3fnKAnhM/Qx0r9RvnjZaLLNhFRpVO6iey75P1sjrqr 1YmqbCRz79FCy3leyubxmUjuu4Nt/xil//dYv7OjXlKVTo+zdF65jVKnttAe00FLd0In wnGpKYukG9CeBlbZR2ncRa5UtJQxT0/2HYjovN/5NS6/Z1TdEOiJBdYSHVS9EZY0S9RN J9PA== X-Gm-Message-State: AOAM5334DWg8g3wvM4C5RGML1/poGRj7Cx4xQAWU7dBrv2CDLH2pmcQ2 IIbtJiZEdJJho0x0drk7lURB0GvZ3D6BDw== X-Google-Smtp-Source: ABdhPJxoMv156RduYn+/OC0eaSp3/PdXvYmZ8mjUH8AKAJ4VO/AJJkUflfkrIKGw0Fwt5q28ZR4/UQ== X-Received: by 2002:a05:6402:b64:: with SMTP id cb4mr2462608edb.25.1601943448942; Mon, 05 Oct 2020 17:17:28 -0700 (PDT) Received: from localhost.localdomain ([109.227.55.37]) by smtp.gmail.com with ESMTPSA id q12sm1017137edj.19.2020.10.05.17.17.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 17:17:27 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Oct 2020 02:17:13 +0200 Message-Id: <20201006001714.19577-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201006001714.19577-1-onemda@gmail.com> References: <20201006001714.19577-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/apedec: use proper macro and type for pivot 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 --- libavcodec/apedec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index aa4d8fa524..8fe7b5ee86 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -559,12 +559,10 @@ static inline int ape_decode_value_3900(APEContext *ctx, APERice *rice) static inline int ape_decode_value_3990(APEContext *ctx, APERice *rice) { - unsigned int x, overflow; - int base, pivot; + unsigned int x, overflow, pivot; + int base; - pivot = rice->ksum >> 5; - if (pivot == 0) - pivot = 1; + pivot = FFMAX(rice->ksum >> 5, 1); overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);