From patchwork Wed Dec 30 23:31:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24717 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 926C244BA0E for ; Thu, 31 Dec 2020 01:36:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 137F268AA47; Thu, 31 Dec 2020 01:33:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9EE568A987 for ; Thu, 31 Dec 2020 01:32:58 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id jx16so23638388ejb.10 for ; Wed, 30 Dec 2020 15:32:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=mML2mI3DpkdlxnxL56UbXUAh0/kYEdV6+XNYm0fsaaE=; b=gTcqTIsCDhsdjDPQHr8lV6FIi3AzPH4n+2LL6qSVWRI+N+8tFzo0Aivo5+KqiXnmLQ 7Agbo2ut+wapt8b3UhcnjNVBWdOfN9NNdg5oF24nS09Cm2dlqYm5qAwoP7HQKo6v/EwI ZCDEoB97cXCvsA6Ms+Dm0Y27o8ZA3NHC4RzjwuCxgFhRIuAUYAn1SCIhL5fkyrhVapma 7sfprOwysLnuP3T3JW/PTmRD1NlcWdzVjgSbNa7ttqUPPtZOQ5ZlSTAVIybYU1eaoThE U+jf0ke7hYwFFJrRajIscRsrHtxY9vpY6pNyHboakXmSlBvG0fCt4XdbNNNN2U+L7nZE p+ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=mML2mI3DpkdlxnxL56UbXUAh0/kYEdV6+XNYm0fsaaE=; b=U5N5EUQzLlHNTnKvrqoJmSSwD2SJxoefYJ9//qOCQEh+5rLl8Zs1e4HX2McvpjWyrG k1LcMAJAhP4VkQ1HdiS/tl6Top9NsOW8bYEHDIpfcLDGu8BEeE2P/qfUalxJaEA56bfk iPRrG8D0pJ2WvLfZP0u3c4ZwpyFtiDO9RU3DgrWU5HX8hvDShWWoaFTMbcihG5JTBoQW J12asYp8Hu5b+LcMjuKkzfRBGKtf/RugNp19h/tueotOIcBGk5H/6ZGfrfs1Pu5vnQrQ X1Fe4jXDiGWQoN5zShAyJ2E3SfFv+Ftv0qvPE6JBtqDDnW5DTASipW5NyG0U5a6yKfxj lbcQ== X-Gm-Message-State: AOAM53062e888k8LX5jtMfsK3T6pwF01W1l/XWMb4DybmBHsYlW9Med0 UHFTkBiXDvKSjP6wAtyqCnG1NjZpJFU= X-Google-Smtp-Source: ABdhPJxrq19u3u3+8Yi0B4yBQfG3X/c3X2/CcRFujcIIAvcxCH8Ra46qB332gx1+Q0GMz4zjdztwgw== X-Received: by 2002:a17:906:d28f:: with SMTP id ay15mr49540020ejb.327.1609371177529; Wed, 30 Dec 2020 15:32:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:52 +0100 Message-Id: <20201230233157.1055287-25-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 25/30] avcodec/dirac_arith: Make table only used here static 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/dirac_arith.c | 6 +++--- libavcodec/dirac_arith.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/dirac_arith.c b/libavcodec/dirac_arith.c index 36142fe198..69b6280230 100644 --- a/libavcodec/dirac_arith.c +++ b/libavcodec/dirac_arith.c @@ -28,7 +28,7 @@ #include "dirac_arith.h" -const uint16_t ff_dirac_prob[256] = { +static const uint16_t dirac_prob[256] = { 0, 2, 5, 8, 11, 15, 20, 24, 29, 35, 41, 47, 53, 60, 67, 74, 82, 89, 97, 106, 114, 123, 132, 141, @@ -88,8 +88,8 @@ av_cold void ff_dirac_init_arith_tables(void) int i; for (i = 0; i < 256; i++) { - ff_dirac_prob_branchless[i][0] = ff_dirac_prob[255-i]; - ff_dirac_prob_branchless[i][1] = -ff_dirac_prob[i]; + ff_dirac_prob_branchless[i][0] = dirac_prob[255-i]; + ff_dirac_prob_branchless[i][1] = -dirac_prob[i]; } } diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h index 79526a7ca3..350a58fca6 100644 --- a/libavcodec/dirac_arith.h +++ b/libavcodec/dirac_arith.h @@ -86,7 +86,6 @@ typedef struct { } DiracArith; extern const uint8_t ff_dirac_next_ctx[DIRAC_CTX_COUNT]; -extern const uint16_t ff_dirac_prob[256]; extern int16_t ff_dirac_prob_branchless[256][2]; static inline void renorm(DiracArith *c)