From patchwork Sun Sep 8 22:39:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1393860vqu; Sun, 8 Sep 2024 20:14:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWp3CqbbGWIL1RxFBx7Jmkl/ZWVzROTB1a5CDrpw0ruxvmBA/w4Y9PzgIe2ob50i9yZ8sHcDrGD+akWGZJ6z0pK@gmail.com X-Google-Smtp-Source: AGHT+IFuQK5jW1qso7kdv3Zesp1uqGPT3yh0f5WEeZnMbokWhZkNGb/wiTOrzoIUSFLLeQwGM3cd X-Received: by 2002:a05:6402:35c1:b0:5c2:4ad9:6d9f with SMTP id 4fb4d7f45d1cf-5c3e953355dmr5969141a12.1.1725851650894; Sun, 08 Sep 2024 20:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725851650; cv=none; d=google.com; s=arc-20240605; b=Ay8778A5HIw6nZke+pGtpeY/vuPaJpNYOxEmdW6LRzz3TILWZScWoVUW8HJtKADzZ+ vXR77PjkpHChX11EPwE3tHL0DdiMqfCBiaCaXcT7zrn72If3qP5h+ghadXn7wVA/tNRa 5fENkdqUtuIFS+LxK2W0lg7IbTHsDh5Kv8KNK+ck9w1+uah22R4SSIZjHNkGuNmiMIHl aScpb5RpulPKRaBqhm2X7Ifibr+QOgRnxdACBhHtPlZCwa0rjnqzNDFmsFuFrcq11liz OlsB9057ubcPm4NYMgoPZpopP9l6wti0sy+nt34/ZJrawb+fqYCPBQDD94PQQm+E6muM XYGg== 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=eJv8XJw/JjiPrqx1+a+EYIm7DE/04zoI2Xkj16Ekrks=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=OCUzToutpykSORumyKbb0gWq1na3h/JP6ycNmykZ8jvTIhmfjlsEtIDnox4RaIHtUN CAg+6kVD1zfI8u0xfD7emnzPdF5MbPSAC/X267f3uyzcUziWgSA2x2xRtabeW9wTAocx 2fsN8m1btZM2MavABf0cl91X9OtOtKbQdBQiaM3bG/B7qYVjmp6ju0uPlzL9wV78rj4V nIGBYJMCcpsycIPBjI4MYCmtOKkSLT5Xah2m8JO6NTECIcYDQMo7QKAkNyAzZ5ffxM+I ZUV87x92M2D2tLyMOfKDpRytPIw4r9jPiNthoIxSrsQYxm9dvBmGr9rcKbDkzbVRxM5z fDXQ==; 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=b62E0fGV; 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 4fb4d7f45d1cf-5c3ebd42aeesi3204287a12.139.2024.09.08.20.14.10; Sun, 08 Sep 2024 20:14:10 -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=b62E0fGV; 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 63A9C68DDA9; Mon, 9 Sep 2024 03:55:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E64CF68DC7B for ; Mon, 9 Sep 2024 03:55:34 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-374cacf18b1so2194199f8f.2 for ; Sun, 08 Sep 2024 17:55:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843334; x=1726448134; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=7JQrH0axqUAJ7U2APlrsGPJG44BqfADvla3FvTtqJnE=; b=b62E0fGVReuKrXB1v+rtKjalLkWPFlf0XzmsqFma9wcAwqEqYqY+I+oDeVBLLWF78o ajT1EEVRo7/GKP8pHmIzuJl6IVdcQ10FvhL87hL62vCMko27MZkDDtFCKk3FRjIffWoI uhtkURvawFA5uCWYgDMzkLdCRA1bUdubihLRjuI6HXj2SUmN3LuGY/O3SnlSyK6cT079 HN+GXUnf3TGt5vz01Um+JBI/LWiuSP6rjyGW2WMUbu9XQXVcMtDdtL80KyXVq9MDkdTt 7ojeZy0ZT7T4reSdPPpnj4MHa5lMWBsonY6uEWBxJSUQ2n9RCXmoYEiw2GGENu8tl2go ma8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843334; x=1726448134; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7JQrH0axqUAJ7U2APlrsGPJG44BqfADvla3FvTtqJnE=; b=Pd/hvMW6c3+PmSVLVd2QL4jSmXieWqoxwMzhEjNVjFcWQdL0DiVtwmPbfKtU/29wzl nNcH2iivJPNmgA22ivege55ZlG9E/mxkVIUl0+yGXrV5C/tQdfyGfqDqatcRGlxPKQ9X moXYLXGm4cZC06fcrEma5Rmlg1qlGLjr/QH1Ss8ULMdRHO/rojr4tJlNYeZXj/4V8PEm 4nj5L4CLzGVv55Dc8xRILLVHHUJLinxnVZ69RFK/sH/ZeHi0/rMM8d9txcXifUt3h84j dCZtDv1WKBjVPxSiI8ZZmAb61R+WuP12wEI3XFpNm0aFUVysJT48WbwSFdihsSH9Fil/ oYFg== X-Gm-Message-State: AOJu0YxirTafi4suVS+jPtJmq8ZWN/soQ+RQjk+j5FQpStRh1DcSCml0 fsxTkuF62xm2vFHKyPEPPP9HDjdNVs38h8njMva8Sc8dX3W783niBI2uEw== X-Received: by 2002:a5d:514d:0:b0:374:c581:9f4f with SMTP id ffacd0b85a97d-37892727f2bmr2951558f8f.55.1725843334135; Sun, 08 Sep 2024 17:55:34 -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.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:33 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:39:01 +0200 Subject: [FFmpeg-devel] [PATCH 35/60] avcodec/eatgq: 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: uLTvv7TxY9MI --- libavcodec/eatgq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index d326c05390..b760f29243 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -154,19 +154,19 @@ static void tgq_idct_put_mb_dconly(TgqContext *s, AVFrame *frame, static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, AVFrame *frame, int mb_y, int mb_x) { - int mode; + int ret, mode; int i; int8_t dc[6]; mode = bytestream2_get_byte(gbyte); if (mode > 12) { GetBitContext gb; - int ret = init_get_bits8(&gb, gbyte->buffer, FFMIN(bytestream2_get_bytes_left(gbyte), mode)); + ret = init_get_bits8(&gb, gbyte->buffer, FFMIN(bytestream2_get_bytes_left(gbyte), mode)); if (ret < 0) return ret; for (i = 0; i < 6; i++) { - int ret = tgq_decode_block(s, s->block[i], &gb); + ret = tgq_decode_block(s, s->block[i], &gb); if (ret < 0) return ret; }