From patchwork Sun Sep 8 22:35:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1464629vqu; Mon, 9 Sep 2024 00:34:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFZk2JWkWKkPx9IBMEqbca9voatw/pkRFqcBQ+TTlczU2RrlyVvH8FEoSIhrSJ/BCEgz8CHRgXGaer2eOOi/uz@gmail.com X-Google-Smtp-Source: AGHT+IECRFc8qTd9m0SmQgvt7/sMotaXH9oPc+IfmsNIad5n7OlICf7o95Gyh0Lw6fAmOsHZelMx X-Received: by 2002:a05:6512:2313:b0:52e:9cc7:4461 with SMTP id 2adb3069b0e04-536587a67c1mr6977108e87.5.1725867249570; Mon, 09 Sep 2024 00:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725867249; cv=none; d=google.com; s=arc-20240605; b=YeU6VMRn385zJ/G2+JH4aonUp9bmgk3KIXLd1FV/fpS48bc80tbR963QHtsUPN7V5w yn9ndLarr82VtsIG6ZmzZpNWsecdkz1cZuXkYLszZPzH/grabJ3bN6q3M+K3NRwpr1nv 8pTwYDOCD5G4aqbOEAt2wwNUZ1M67bCBSYRUmyZ5gdg00YrQA/TeEf1voz22RNlY/3Ah XYS8x3sP2f/CuxjXdcbcqeWnj8Fh40j4sJ3lAAijSm14qyekSyxxRMskR6xDpnIof1NT Im7YyoXpJqvunD9KzjpJXgVprWo1rOpuZGcHmU9jISma/GmmiG2FNxBu/TVdaO91+bbj 0KNw== 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=cHjCtjXIFRiKTRYi017syaF+G2akEQd5t8ZPgE7UhbU=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=DFA1RyKKo63Tg9WT7C4h/nO5nWfQVPWrbCjJGC8wah6XTE8C6OpzegliOxOQw4p38t Nw+zZvgSDTumflLqMF1JdTU78r+8yu/Udo+bc2DcmAhernb48WXul4qSG67lUwfUHZAI nCfWsP9S3cZKwaS1lhg55uUtlNx4OEjQcqeclN3Tu5E2bqEFkMlabT9AkbVlnvpp9Wpf m6ZVE98UoKiUCR9nKz8jmCtKqenJm3cFre2kJwRdSujksGTOuMbownYw9ywo9CI5/Wus euuRqXPHtzheq1Uu8+JfsvGRiBaLlwNGzGm9Kl7VdGzT8nA5QRIND7qcAL3J9Au6vQpQ MXdw==; 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=PD3N5zpx; 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-5365f8c16e1si1443037e87.300.2024.09.09.00.34.09; Mon, 09 Sep 2024 00:34: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=PD3N5zpx; 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 3372F68DD86; Mon, 9 Sep 2024 03:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F158668DC7D for ; Mon, 9 Sep 2024 03:55:32 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cb1758e41so11467045e9.1 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=1725843332; x=1726448132; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=ABuKr7JoBXG+mvJ4WoR1WCQAbtjSx4YveStSh/yNj7Q=; b=PD3N5zpxoSNuRwFNktkvlAaijnm1VMGCPzhi/ffcGbL8lwZFCLk8Ng50TSKS/rRyrW 0+aOu9FjqjxqwBVNRMs7MbOl1GDbpw0vl2kFV/cAULqXwUBa+4Mo58+0OXyjiSKRNghT NpVOhX3Q512Q4cdiUgDlnTvjkSnsFalhjyf2wtRBYpJQC2jm5lOWNd+58d6XKcvK1ZrO xzuJs0o29hZ0Sua8ALz0bOq10lXM8rWSrBXI/UcS0xWqZQweURHc6hD0IEqi0lz1k1Wz xZ21l+NH9NGldTaivh0SsXt1Q9eTLd/KovCCJQpKjsU28AIXhlma7qoRSQhdZDFa+ltT SDRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843332; x=1726448132; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ABuKr7JoBXG+mvJ4WoR1WCQAbtjSx4YveStSh/yNj7Q=; b=diCq1DBKSBKeSl4xuTVi9HR4KD5h5mm3GGJ94sF/BDeLhbAJgoiISwja8325x89AY2 1fAK9+DXZf6LgY7Pti6zzEGKX3hFwySqL7zmtZLHxk34s9QB4eEdK4GHR0Fl32OfLk0k 27TLB13hjDO2EyGwpjCuJwuxnHwFX6i9sad/4jDjwqqKZpU/LJdDmQQDYtfG6rTOEh/P sg6HCxdpLE2o4H5yJnNNFSGGQ9Q6sGXZEiqmQ+4Ig6pw8ylwk1equzSl+bAUuHyLVFln lhFJT4135LQ8MbFuNDW7q+9Cj+x4FvUXYLcz3aocfjFPDnPx3DI2FNkDgdy+sy9oZtJA +HPQ== X-Gm-Message-State: AOJu0Yz7jqSUX9G+X/JodPM/h6SJuP8umYjyRRjbiIEa8mHdOc2sXZIy 3Nb1DKZFJ4WsklxzKdK1fnaPjVahL3gHJVFpuYEpsi9RB3Gyv1UXkE6rpg== X-Received: by 2002:a05:600c:3ba3:b0:426:6f27:379a with SMTP id 5b1f17b1804b1-42cae70efccmr37085075e9.13.1725843332346; Sun, 08 Sep 2024 17:55:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:31 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:35:24 +0200 Subject: [FFmpeg-devel] [PATCH 33/60] avcodec/dv_tablegen: 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: Fk91hEKvrZn4 --- libavcodec/dv_tablegen.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index 7f0ab53fa7..6d3e200a01 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -51,7 +51,7 @@ static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE]; static av_cold void dv_vlc_map_tableinit(void) { uint32_t code = 0; - int i, j; + int j; for (int i = 0; i < NB_DV_VLC; i++) { uint32_t cur_code = code >> (32 - ff_dv_vlc_len[i]); code += 1U << (32 - ff_dv_vlc_len[i]); @@ -70,7 +70,7 @@ static av_cold void dv_vlc_map_tableinit(void) dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size = ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]); } - for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { + for (int i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { #if CONFIG_SMALL for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { if (dv_vlc_map[i][j].size == 0) {