From patchwork Mon Sep 9 00:38:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1378692vqu; Sun, 8 Sep 2024 19:14:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWo+A9zawTypNFgI6wJVwcIgrdK2qe9H9T3nVBMQRODC4JnRvHUNjujhM9XS3wkYfu70qnwGX7BZgXvseOclTiU@gmail.com X-Google-Smtp-Source: AGHT+IGeFtS+6u7iz0d0J00ejPxmNVOkPyj/31mSyeL/zawi60nXPNWzZ+U9Yp8iO92/kUi8QZJA X-Received: by 2002:a17:907:7faa:b0:a8d:2624:1a84 with SMTP id a640c23a62f3a-a8d26242585mr195172266b.11.1725848052677; Sun, 08 Sep 2024 19:14:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725848052; cv=none; d=google.com; s=arc-20240605; b=B78YNQmiLc087qdchEYUnoqjmlWHWghDU/k3x3uNQnXCxub4Xj/MdlwUPTh8yjlgWf k6Kak86LpoMF+ME8DygeLiPY0jXHsCg3jTfighwF+EoCr07INEYdzEoF5JcTUe0RePOv 9LapG0aupisJAu+sQTTGPsXS/2gE8B8A+hy5O7lQBo8/CTTe/cUPy+zbIr1AXcjSYcXp sCdgOCk1z4QNEiLxlRz+2L3gofChNIhZbOcEwLl5QyBDbg94wK5we7DP5W30y/peQH4m rKwuNV3AqIKvUFmFwuWTEa78gqfD0S8e3+xiWwR+kr/UtBISn/gav0j5SBgzTFD3N1vn n8bQ== 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=olfq669yz+N+z5YYHkdWs5coh4lIaWCmPb/iKsX2JD4=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=lKAEKvb/4tpzslDVVjH3zVTU/xG3ye5f033Y25NT2CILDdbyc93nVvqZh4HCH+REUX dJudgWUUsAile2z5yoIyrpNwJhd+AS3wtldRfMFIxZgAot7fOv7GVIBEdo9pycJ7Q45C LjUsLUAZt422GyS1jZyPqQogQ5Z06hbkMOnw5LfwlSMCLHzVtMSPUczF93jsqm9jqyv6 41PanNi49cqew3XJuPvwMN8FZxVYU4k7PM+X6WfHWrVJI1kMbqq98GCB140VlzqyhQQF IOW65VSRjR3Mkcp0Y0ScrD4lb59pRe0WFwike7PFAXA/mmxr56Wt3EI5PRyyUgRbZFjg /U0Q==; 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=KtYMEK65; 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-a8d25d66081si311545366b.843.2024.09.08.19.14.12; Sun, 08 Sep 2024 19:14: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=KtYMEK65; 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 5613168DE79; Mon, 9 Sep 2024 03:56:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 564D168DD8D for ; Mon, 9 Sep 2024 03:55:53 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-42bbd16fcf2so34453375e9.2 for ; Sun, 08 Sep 2024 17:55:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843352; x=1726448152; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=Ug5BvGhLdJtGYEd/vjUr+9IHKxR7+jqXme+SLiWx7/A=; b=KtYMEK65e2kO+tLG46p21WDOCzTjIP75AnnbvA6gQpShwLlUhUAjnKJNTxReb5VpHu ZmI9lXOdnXx20ZMTw4rpoF1HxSXkT6UpqTrHRtdRZkwe/oZsyfZHtbHLd49fRVWoAOa3 EYYSkv/+iUeMTCnKQnXeH8oFGldcpXDhiYSj7y/Dsgz3I7jF7am9SVQV/pLMD4xotQDX hu+4SzwVxhrERq2awbVBN26oE2674aDTWFBViv3tK5U/AX5e/jHmk70Wo5AQCQ51XM0T 3o1CIjGtzOeoV7vg0ucy9krsB7sNzYbeLAI1Wh1k6GyWluJv/IoEHp7FOTGOwLFw4kQY TJjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843352; x=1726448152; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ug5BvGhLdJtGYEd/vjUr+9IHKxR7+jqXme+SLiWx7/A=; b=otebAhJwLShjfoY6Bk4Iw4apAqPvqGw1YIpZf2H2dB4nHJuh4xW4pUX/XmgYOI21mK nJcEd2KWNlyr4DxC5t5Mg/j85MMmAgF6SjrmoofpgOZGaH3EmXZbW2caH7eRhgJ+eILK Z5swIvlWJG9iNa+Aksp3+BFj36Dti1rg3zow6uWHM8EU2EPIBM10PdUfA0lUdONeSMCg 38zZqMZjo/ibZqysRsrp7M7my0LVUB1T+4a/v7CXAFmNNj/+hypcDght2m7nbvM0k+Ll Uighdi63iiUNqN8ALs3hjN1rfCK/v+80AN8PFLnxlBA7hTl7Q3yRZsNBN2STPbPxR0s6 Ej/g== X-Gm-Message-State: AOJu0Yx3ktJ57hIv/hsveqWIMIdMzRY0KGFeA7ltUl/sol2IIP+VrEkO ijjeRZVxKABO+RRMybcgPG+MnUeaPlucWSD/BipIorp8aEeYENqbjFU70g== X-Received: by 2002:a05:600c:4f88:b0:426:62c5:4741 with SMTP id 5b1f17b1804b1-42cae70a06bmr37401225e9.2.1725843352677; Sun, 08 Sep 2024 17:55:52 -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.52 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:52 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:38:21 +0200 Subject: [FFmpeg-devel] [PATCH 57/60] avformat/bonk: 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: zRAlbJ/OjuUU --- libavformat/bonk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/bonk.c b/libavformat/bonk.c index 44de8e2087..d5eacfdc91 100644 --- a/libavformat/bonk.c +++ b/libavformat/bonk.c @@ -63,7 +63,7 @@ static int bonk_read_header(AVFormatContext *s) const int b = avio_r8(s->pb); if (!b) { uint32_t t; - int ret = ffio_ensure_seekback(s->pb, 3); + ret = ffio_ensure_seekback(s->pb, 3); if (ret < 0) return ret;