From patchwork Sun Sep 8 22:33:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1447064vqu; Sun, 8 Sep 2024 23:44:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLR9fvLWQrDP5t16uIPE+TVQi1dCUmP79k/fMUyUmJH41xrQMHsJeCVYP4iCO9fqa6rniJ4ZMjd97EM67iUTAH@gmail.com X-Google-Smtp-Source: AGHT+IHC12XMcmXoqCnZbHgzgf73WSuhizJbBQU1cFXwUnwrs4TEmAK0n4TPNl4bWLYwqufp6gIi X-Received: by 2002:a05:6512:b25:b0:535:4144:f9d3 with SMTP id 2adb3069b0e04-536588197c5mr2648305e87.11.1725864251141; Sun, 08 Sep 2024 23:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725864251; cv=none; d=google.com; s=arc-20240605; b=ErFzsqsQrNFsNjqJu23LVUT4AnnYTF0QGLVDxGnU2XymRPiGJxz0BCwViobJCYj1IE s9SujWwom8UeHldiNi1lglIEM7q9ZrOWN9R0Hziwue4/wxSZtF381/lgVcJvcpQjdPrC n0t2X2J7GsJkz0cVT9VB1vBwEFBq0xNZLF9JezRaGDCfnVk9LcsRwiQ+4b7X28i+tVry fzuYWewaR9Bl8/x9vHDp4MF5QvISre4BbIP9rbRCqN15wkBoDqiUGxCB3cnRoduNDTVK Ca0SPc/djJR5ceZoenXpuLQMILv87qZ9luVtCg2FgKzK03W4Y5ikiLvh7ydTCvifAx1w 41ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=SUcVGOp6G0YH+oL2T0HUsPeTZGMNjMfbk506EU6zFX4=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=h4B3qn2akA5YKOwJivGF/48TF1npv/aDLcuxmKzosWzE4SotV5eQqqquiwAM9PBaid 7Mhzt15Lx97MGJKWqA11rD3TxypBOoSC42Pzt9hjLz9fVxWqmAGOQ0dkxDLyk5U+iu1H 5Nx3pDgmqDWJf5VvsPd1u2hWgC7pELLjTwvZ4pYaJHM38ijD2X2foh4Zllb8UnXcT4xs PLArMxJunHg1cNXsMRHquXqu6AjwrCrSR9r8fvVVMFIBrW3hWB7omIeohYPRelyvXAfl w3U0g6RGnk3bem9GJB2y7/I/28Ln6+jpruXHPVhbfTc6TMTWCpUp5n17ic8jy+LD4EK/ nFug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kwDbrvHH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-5365f8c5e41si1361749e87.215.2024.09.08.23.44.10; Sun, 08 Sep 2024 23:44:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kwDbrvHH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E01168DD84; Mon, 9 Sep 2024 03:55:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50A7D68DC65 for ; Mon, 9 Sep 2024 03:55:32 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so8007825e9.0 for ; Sun, 08 Sep 2024 17:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843331; x=1726448131; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=F4BVqM7sO43HZSZHlGn3fmiOfu4dXcZtdV0RN/+Yipg=; b=kwDbrvHHdgaEe7sH3w2uGBG1hE5y5wiAEQoFBdgnDx7HrVrl+Sxkzyra9U89xoBP1o K/bEYcvFAyGCY9NaAJ8TAxyJn15+vQIlPRuXc8x8Q1wGOPRafwdQTUYopXg020sdp5g4 MMGmKjFGiv6ss8y4VpQwBR+W/IH0uho9Rmk1mpU+vBcGl+y6kfh5n+CYmH3Yqk+K16fm hb0pxBDtYlTz01bAlXdThWZwL3voANpjA4M7RWpzASCekLRCe47w12CTA9lwBv/H+OCU BEU+EYyh7MHw3N/b0Defn9QF4y4gB/mb8WvJzaUx9aqNP1xtujjhOIlYu71iFp9O1Odm mgPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843331; x=1726448131; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=F4BVqM7sO43HZSZHlGn3fmiOfu4dXcZtdV0RN/+Yipg=; b=ruhuzUF9C/NGJjhgyfQFlU+sZynyrU96co/0FIxDrVHnajkCyKNmYzQMI9SH8fkQr2 +KC//nMw9hASA69yI7T7xUOB5MbkWD0SyWA2dHHHhyj3dEy3K/ISGDBn23Z+OdolWeVB 7RYMKVpbMx6JLBfllTAJQ3PtwfqP+5vNtCe2+3EMNcvJJ9FaZdkPnCFh31FDtb6FGu+P ES+y9WDD5WkTwUOiukb363GUj+Vp3HTEdY6n7CfAd2QJ+FO80v1GRA9GdN5UWHbFCuiY 4rsgSc9DReJsKQx2QJvTcQe4jrKA83Ww3XYmr/bcv4rBSUXu9lkphOEHNAoyuh7WZmyG zpHw== X-Gm-Message-State: AOJu0Yy70N1NQ6OG9rV9LGhsugHkBmC0ibkGPVBeipOGLXVzK9fVAaMK FogoRCpVbaASdwJ8aYcCciwbQSqZmfixdvNE5q8p7whAfCFMWzECF9Mucg== X-Received: by 2002:a05:600c:3c88:b0:426:59fe:ac27 with SMTP id 5b1f17b1804b1-42c9f9e087amr86864915e9.26.1725843331450; Sun, 08 Sep 2024 17:55:31 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.30 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:30 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:33:47 +0200 Subject: [FFmpeg-devel] [PATCH 32/60] avcodec/dvdec: fix variable shadowing X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Wz3XmsK0lkbA --- libavcodec/dvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 8297b6d2f3..7ca891e93a 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -155,10 +155,10 @@ static av_cold void dv_init_static(void) VLC dv_vlc = { .table = vlc_buf, .table_allocated = FF_ARRAY_ELEMS(vlc_buf) }; const unsigned offset = FF_ARRAY_ELEMS(dv_rl_vlc) - (2 * NB_DV_VLC - NB_DV_ZERO_LEVEL_ENTRIES); RL_VLC_ELEM *tmp = dv_rl_vlc + offset; - int i, j; + int j = 0; /* it's faster to include sign bit in a generic VLC parsing scheme */ - for (i = 0, j = 0; i < NB_DV_VLC; i++, j++) { + for (int i = 0; i < NB_DV_VLC; i++, j++) { tmp[j].len = ff_dv_vlc_len[i]; tmp[j].run = ff_dv_vlc_run[i]; tmp[j].level = ff_dv_vlc_level[i];