From patchwork Mon Sep 9 00:42:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1381337vqu; Sun, 8 Sep 2024 19:24:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWx/e+uJNigsZ0LCmV6nq9HguTtxpavK0WJRVYtV4WjKCVaYzFJxk9Aa0KERGmwMdArJIJ6zoQHUmO3XT8wUVFZ@gmail.com X-Google-Smtp-Source: AGHT+IE/PCUZMGbsIHvTbkcfv6F20Rgi+T+FOUPXkP4q193ltvQsW92QJxnmZE8Ll3hNFqcXyuvb X-Received: by 2002:a05:6512:3ca2:b0:535:6ba9:f0d4 with SMTP id 2adb3069b0e04-5365880fd95mr3017832e87.9.1725848653471; Sun, 08 Sep 2024 19:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725848653; cv=none; d=google.com; s=arc-20240605; b=Va5XCihpQt0OTfQWQcHHmZFrlsBEqSlL95RL//YY/BfmzsGc73YNB14AxPMvLXlguf yjpPD49BriNCJwwCtgPm3Nq8fkTV19mx/hUovI/npgFeGEjFOjXHWR9Hdmfj0Wg74NuO uQCrHI63J04rOf4uv7HlUWgEqTT8N7KG+wNSfGeAlCk0bXW8Rr+ddtlR6hpIoJd8Xk6M 6MaEzuZ4N9DfT97YcAu+E4jeoVu9a/UC5GlmPsn+Lvx//yJLqrrxjXSE8zg3nk6+0kq/ fTqxdJY1VtndHKSCHIAMiCkyTx3txkv6W8mrGo4hoHBuDnLvgk/HejKRDCNKxWIsxZRd rBug== 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=a5wwpq7hCQLHS1HDw71aJaXTYPII3FkU66RRhYxfJ/s=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=WbPTB5gU2fotBBMsWFZ2vVODuK5GLtc60QViilkbyjNj9205SLZoP3+B+ElyRU+pUq g0zq6AOGLArbVj/YACvjdfAnGrarTSV3xVuNoxGaKxnIT335All7I9FwRlbWizRnXSp/ cmEWU1VRG5Vrst7UJGChYxbAIuix96nEMIsu2O5AHX0P9tmRkb/xG6EkSzymInn16GfX ig+wiyIuFdhotZzZnR1RPEAV+ceQ1p6ZDUMKW0RI9HQOzz50FGDnPRzROD3ax0/n7fNF UM9kvnumwhF1LWc1vLeZ034DEAso1HY8zbgpmVEkvgCAy/kYJyin3kUUx9EKmp1q8DqP C9Kg==; 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=lNVsYfd3; 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-5365f8c15a4si1329662e87.237.2024.09.08.19.24.12; Sun, 08 Sep 2024 19:24:13 -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=lNVsYfd3; 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 814AC68DE87; Mon, 9 Sep 2024 03:56:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C81BC68DD72 for ; Mon, 9 Sep 2024 03:55:54 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-374c1120a32so2167853f8f.1 for ; Sun, 08 Sep 2024 17:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843354; x=1726448154; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=dcKfcU55RhyqA/fBt+KCEJpfoncz6N4+CiZlAlOJbaU=; b=lNVsYfd3kHUnnGtV+2ZD4z0LAUxuFjIJ/VSmqzjq7Tkl3wN+wm55WSmjKR8u2vWJh+ 2GVjxSIkyBVlK/W3FCCHOgdlnFObZgIDikHklEGiBEQgzkz3vl3M8BjaBG/8LxN3qWmH 1UcI4VTTonXNYM+JZqBXug8bC+CWW3jp8tM58unudAaggKO9h0isw7oS5hZxyCkYbiLc MJCNk24MRaJsuwhWH9f0ERVivS98xyeKBFzdQONEEtMTOorgGaNV4r/TuvvzBz8+dGyM Zi/i4IFMgmXxAVemk+vJKMNInW+QXOSA7HVmErq7VYenJPwv26q1gU07lTs27ZTWQ0Gf iseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843354; x=1726448154; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dcKfcU55RhyqA/fBt+KCEJpfoncz6N4+CiZlAlOJbaU=; b=AfAa7H5JABTAn4ckuETaB877l3yqS7aUe2vVWvm36Vgrf37RkfvD8y+4GSBZUX6ISg 3YODFhuvzvRyffLv/Cuig5rHXJsE7p+eRBv/NpWhryySNmzQcwwLsNV9/7VzwNxsLzBJ h2z2AWRjcN+9PdN7/6TjLoMCr04VH6LNh1RoyuDIAKuyegS0hRCLq/wqmNjcgWScIFf2 iT5kfksECUZP2kWVE1aQDArIxC0QGyxa8HgG3QHu1LV8CFn4Qa1TDj9LdX8i6vYQBg3K BI0YOqQtkvvGHjIRjrwMqWRU2xF1VTO0IvjdErshRFH20dGG4QfXxV8r45DnKrTrigam EOmw== X-Gm-Message-State: AOJu0Yyiq5YYMDuQmqpHGNdN3f4X4JGKvbF+DxaLojWJSZGIC2vRy5Um v/F+3Q4Pz9KIFW1GuPWggNDdlmhVkC97dE8jfD14zs46T+IKg8XJWfI66Q== X-Received: by 2002:a5d:4109:0:b0:371:6fba:d555 with SMTP id ffacd0b85a97d-378895cbb8emr6596167f8f.18.1725843354163; Sun, 08 Sep 2024 17:55:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:53 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:42:03 +0200 Subject: [FFmpeg-devel] [PATCH 59/60] avformat/apetag: 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: DviL8XURlVFe --- libavformat/apetag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 0989fcb094..84645607de 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -81,7 +81,7 @@ static int ape_tag_read_field(AVFormatContext *s) av_dict_set(&st->metadata, key, filename, 0); if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { - int ret = ff_add_attached_pic(s, st, s->pb, NULL, size); + ret = ff_add_attached_pic(s, st, s->pb, NULL, size); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); return ret;