From patchwork Sun Sep 8 22:53:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1500891vqu; Mon, 9 Sep 2024 02:04:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUJnj6KzeH8WN/IeHGvQENtlMEGfgvTS1t2QLFu4efdMwf4aL9NHX11LRoyaPNU/N8Ln6RxkXFzZirIWZWgUkI@gmail.com X-Google-Smtp-Source: AGHT+IEGo4LGLFZ6MmwmTkvCum0d5A2qtJDDWXnNk8q7HBij/rAcyEPpijR7gosQ5ndNgs1UqFrE X-Received: by 2002:a17:907:9621:b0:a72:499a:e5ba with SMTP id a640c23a62f3a-a8a888da9b5mr293740266b.7.1725872649824; Mon, 09 Sep 2024 02:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725872649; cv=none; d=google.com; s=arc-20240605; b=QzmkmtVchVOr+t1prCrIN96NU7Kjxv34Q7iBlWdJOrAn/tXKGmxJuNKqMNw27tuxuy ZTJGy2yjF2GwBr6Ery4uNOf6MD7fNfZPX/VHXV0LRX0eH8qhwvnFacqTf7NrxUM031j+ eysElG7z+7jUERPH++f0V136DUyK2ikq3QXKj8rGEb/SRkQBwon1HnU6/YZ2BuqsfBGJ hpD2zZDS42PN6gn7dplAZGrd0xaGafjxaleSV9p3Du7YGZr7ONJk26lrBx7ignO/VyqA 0q+QgXLIQaPEMNsednoVPBq0hcCtqw5MJNHjCKX0WkLNM79QpCWpI8QnPLj9rPmSKVd9 WDOA== 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=f2jmRJvUld9wOPoA34GK6vUfSM8E+rIccRMh343WEvk=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=X0mp6Eo0MFuGqONTJt+31QUHY2jgdZbIvOXmQLhFlNvsJPO3Z7dJEX6P513Os367jh 4qrFmxN1etOhm/j6kUdBmOS2qEb0bsO+oh/mQW1crmV7yRPX9mDSqjH6Mb/4OTFoKprM 7hmiF0YibHLzHb7+88kzv/PEi/dTOyDB1C9Rg92eqMlG6Zq2FX3RQaUYU0Cb+dBnFuRh 4ZUl/NHBFLehP0UL27vzX0ZaHlXkHw8rckVe10On8npz878E7lBMrxrn7S0pt264LD+s DqpOV1BbcSsbOQh4YQbefDSX6pi6SBPDGxyEl8PjLtYAgvTkGSCUNwcSsFMTuHMaV+DK SE+Q==; 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=XhaoWIaF; 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 a640c23a62f3a-a8d25cf03b6si336328466b.547.2024.09.09.02.04.09; Mon, 09 Sep 2024 02:04:09 -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=XhaoWIaF; 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 4C2B468DCFE; Mon, 9 Sep 2024 03:55:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3649D68DD03 for ; Mon, 9 Sep 2024 03:55:38 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-374c1963cb6so2256888f8f.3 for ; Sun, 08 Sep 2024 17:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843337; x=1726448137; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=zxGg3moVhihix473FszmSJ4CgUYawOEAtuZEh+wBGKk=; b=XhaoWIaFuCPLO/68OeajwadsygTwvoXdubwX+lTny0VBGIqjqCk7CzjUKJBtJB7Q4u vCB71aVxA6XFCVfhjLFd3imz/2ulzvZ4/uZf4zLCTkYDIqNZvjZzK6ro5ItvYEbSPUE1 y80L4X3ozN6r/hQysJSUo2lBZL9hx30hQW3PKex+ekZfxheZx7/c/jdroLpRgWuUiM9F vz2bxdM4lJVCmF6dUB+UoOvTUucSg2DdhfsEvhpLrrCW3bY/MI5DBoJYRXwKBnYIGifJ NZ0sqMO8kNls2o2+b17HPE3kgVjbTzjtt21mIgSoMTXPplnwslJYb3TSddVErgu93fpo z4QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843337; x=1726448137; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zxGg3moVhihix473FszmSJ4CgUYawOEAtuZEh+wBGKk=; b=tUXmXyl7TO4R9KmTu685WQS6n1jlB9Dw1td7vDcsFKj2RxRxtoDQn7yliHWHLIzJlg mTv0YytIbhlhfAUfGNew4RvDKwEKww9W6s5oROTzqU5pCPdMe+0dRghxU9Eq7zHu6nm+ OsTEE5NbhTxMu/hYFzkTOmFibBqLno5eELVDPwoY+e4WNeumNjDSuD/72M5PQRezxu7p ISHZVgAo8bxUSEWFzf/4vAkDytouV+/Gu+TW7xj3DmqX6YIN3Jt6/ZTrjNUXIct+GgyH crkGCevoaMvftssKFSJJ0alshVpPpbLc9GRyFjcNLxNbmGinAMZitQ27FdJR6bB6IRyK JdXA== X-Gm-Message-State: AOJu0YyUy+IR8w66EkuGn7B+cFt6B1PKCx5B0QfQnOOrvHMxdq7wQV3y 81sgb5assdTxAxHE6wRnihnFg0jiN6ijGFmYwKandeuLSkZRx7v2F1QqQw== X-Received: by 2002:a05:6000:1182:b0:374:c847:86d with SMTP id ffacd0b85a97d-378895c8cdbmr5760326f8f.16.1725843337361; Sun, 08 Sep 2024 17:55:37 -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.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:36 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:53:19 +0200 Subject: [FFmpeg-devel] [PATCH 39/60] avcodec/atrac3plus: 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: 90BY4b2tl4df --- libavcodec/atrac3plus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c index f17ed0cbb5..8ca6989c07 100644 --- a/libavcodec/atrac3plus.c +++ b/libavcodec/atrac3plus.c @@ -75,7 +75,7 @@ static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t **xlat av_cold void ff_atrac3p_init_vlcs(void) { - int i, tab_offset = 0; + int tab_offset = 0; const uint8_t *xlats; xlats = atrac3p_wl_ct_xlats; @@ -93,7 +93,7 @@ av_cold void ff_atrac3p_init_vlcs(void) /* build huffman tables for spectrum decoding */ xlats = atrac3p_spectra_xlats; - for (i = 0; i < 112; i++) { + for (int i = 0; i < 112; i++) { if (atrac3p_spectra_cbs[i][0] >= 0) build_canonical_huff(atrac3p_spectra_cbs[i], &xlats, &tab_offset, &spec_vlc_tabs[i]); @@ -103,13 +103,13 @@ av_cold void ff_atrac3p_init_vlcs(void) /* build huffman tables for gain data decoding */ xlats = atrac3p_gain_xlats; - for (i = 0; i < 11; i++) + for (int i = 0; i < 11; i++) build_canonical_huff(atrac3p_gain_cbs[i], &xlats, &tab_offset, &gain_vlc_tabs[i]); /* build huffman tables for tone decoding */ xlats = atrac3p_tone_xlats; - for (i = 0; i < 7; i++) + for (int i = 0; i < 7; i++) build_canonical_huff(atrac3p_tone_cbs[i], &xlats, &tab_offset, &tone_vlc_tabs[i]); }