From patchwork Sun Sep 8 21:32:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1387996vqu; Sun, 8 Sep 2024 19:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2LWcHkV6hCavuprDWBL7m9j/wBCTmb8lTWhPcJqPTiVtSo8O8DmxxQRa1IaLh4UViYF9D4fpLsVwZ8hSwSswf@gmail.com X-Google-Smtp-Source: AGHT+IGy71odn2R4GdqENNE22KQKjYdBimmNUazQdX4xIvbXABgoqG43fq13JsaS75W5CjKnoZex X-Received: by 2002:a17:906:c14f:b0:a8d:481a:563a with SMTP id a640c23a62f3a-a8d481a570bmr359667566b.25.1725850452115; Sun, 08 Sep 2024 19:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725850452; cv=none; d=google.com; s=arc-20240605; b=jfJVKFXpNpTRcLU0ZOijwkWntwYzzJWy4S7OakDMvUBBaj81fcAtyqN1yh8KK6g+lv lSYhyGSmfmmmUZgO+OvrGDqb798K1ZR7mbpkr3SwD/76UIVEYVgTaHTtqZC09ZR4xajg x/ddwX/B6Yt0W9HsRZq0pT5x1APaU2FAAy93kgWU2otbxNdevBXEvTDa5UOXFxlqkaLd T5mLQbp/U9akNiUjcoSEiGo2B6vCTn990/9wXdxschH/ugnWfXu1IJfIYf6kiA4NMCeh A0JHhaENQ3ytoXVtLVnSrswtlwPPVhTvSnoAcxWX+6iOSQAijubcOKmQrmWcxQ2cRWsY tTJg== 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=Ycw6Oc8/RLA0NM+kPNyrMR43CRo6wQ7in7b+qO+wg4g=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=RK/jz+20phrSyLSQ2DE+V2awwAjnHlGBS+b6JuBwAtIYKSpkseex2oPtCU5ptibg0q X8ev3zBOeG8VjHSUElVeBz66hgbwFNGtjv7wEtN+LyBbwz7zJA47DaoRumrrBMwN65jh ArwLpNVfG0/H4xQLGBkEukmCKLswXLZKTDmkgYJjpjhPfOhlHqoeISoYD1lomjjtPtNG Sc8HDAVcKNP4kPcocaXDX1rIrfx9dGbTluorZikUCGpi27erlkb1tfGeKt/nab/TZ7Ov rmredjkSlYjSv4uC3QjMvp4eB8KfdLWhCfGaWBHqXk5dIrB0/xIchH2SYPWSgGXFG3fq BMnQ==; 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=gYarmR34; 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-5c3ebd855absi3033731a12.314.2024.09.08.19.54.11; Sun, 08 Sep 2024 19:54:12 -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=gYarmR34; 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 37D7C68DD42; Mon, 9 Sep 2024 03:55:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59B3368DC45 for ; Mon, 9 Sep 2024 03:55:28 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-374c5bab490so2945030f8f.1 for ; Sun, 08 Sep 2024 17:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843327; x=1726448127; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=6eiuGMo7+jvt/fCnMm7xhvLmYRtLMbnfgkTk6DBqaMY=; b=gYarmR34bImmzt8Ikk6UP+dXH5gF0PWRFVAySo8LSm0PoEfwdaZdlH8r5Ou/3MdwwJ z6bFp698ysHsKLcNCxaz8Mqyj13pCZcHmOdOOZKS1WOsoTM3M+E5miasY94uw0RfESPh GdXcYSvdp9CM39liBUmi7ztY9Zs0TO5ea7yDdpX8c/SQp/UGgxke/FWga/aqt3sG9rY4 t3MvdxXk/kSq6mPRPV0ssy3S6j+DVZ+9II17HTUadbk+YA+B/wai7EI5suRxczYNsp6P 5KbNf4Kta0oD49U773fJbMY+WxytRzfdDL6IgyCRRdmiTqVZH/PNSW2ckZgjXA9ePS9S ZbDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843327; x=1726448127; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6eiuGMo7+jvt/fCnMm7xhvLmYRtLMbnfgkTk6DBqaMY=; b=SGVOj1gAuKugB9Yrc0be/MFHclRefMfnmKmQ3RpoInF1h4PDZdziaZI7E7zBWn7FLF 8VgHMBxpZPyvqnXFvmptc7XuUeTzlyHp5IVpSfRPj9cXU4rE6YUHcf2BbXcWDwAreRuW 1nwc1xaeKdivyXilFkgI/9BP8oL9u9qVENulv+iryk2K27yA/2KDWaGsZ//9KdmgM11x gb+BABePkMiVZC1OOlszmnfbawQ4A0yko1ywASITtz/kM2CZQEmDxvXB+XOgdFwEXomr YosfyN0tMA0X46XqQxZVxAZU1EiWeFNNuUJ2bxMjl/6WmbQ3u86cfPShLaznLo8+/Tgl 6raA== X-Gm-Message-State: AOJu0Yyd3BEKfUc/kiWv+uIAKzRv58K++Dlvm429+28i43/vFfCWKa8q NETTFSRQtk1sCxpF7r5JU4ZPQaPeESits0XUhYd6WwTTroKqparwJl7TgA== X-Received: by 2002:adf:f147:0:b0:374:c692:42e2 with SMTP id ffacd0b85a97d-37799f5e933mr9962220f8f.9.1725843327536; Sun, 08 Sep 2024 17:55:27 -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.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:26 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Sun, 8 Sep 2024 23:32:59 +0200 Subject: [FFmpeg-devel] [PATCH 28/60] avcodec/fix: 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: CBSJHsFuLiwd --- libavcodec/fic.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/fic.c b/libavcodec/fic.c index ec26e3154d..4763fab689 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -191,8 +191,6 @@ static int fic_decode_slice(AVCodecContext *avctx, void *tdata) for (y = 0; y < (slice_h >> !!p); y += 8) { for (x = 0; x < (ctx->aligned_width >> !!p); x += 8) { - int ret; - if ((ret = fic_decode_block(ctx, &gb, dst + x, stride, tctx->block, &tctx->p_frame)) != 0) return ret;