From patchwork Sun Sep 8 23:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1362319vqu; Sun, 8 Sep 2024 18:14:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8ZEY/y94P0+ys0QfSFJ6xx+I3cDGa+ddwXcOzfIkM0Bp7NuofHctDFDXt8HkM5ecBKet1E2t6iT8oDwafxxdZ@gmail.com X-Google-Smtp-Source: AGHT+IFIy79NoDpy61yfeqI9Jx2uPxPIDIRyDQ5nemibbWiXdSQVKQhujrRpJADCTYAMei4MN97g X-Received: by 2002:a2e:be09:0:b0:2f6:4e78:e0ea with SMTP id 38308e7fff4ca-2f751f8ac1emr30032311fa.5.1725844451382; Sun, 08 Sep 2024 18:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725844451; cv=none; d=google.com; s=arc-20240605; b=LrZINvJZxUteELKMUOpYo7tJhwbcbH7oK+IHgn/YX36ENL+Mn1aBwOAdP9YId+Nzt/ +0NyFBapMYH7AjCP0B7fYUSQqPhcU7ut4ihp7cSYxCYscUeoDXRhZZTyHFv9rxqU4nTU h79z1WeUY+CjjK722s0fL9szUSihdlpl+98uudbTR156fKh70dxNhVR/x4/6nytU10He qGeFbtB0unF4wWQtYV4aEkmiVtK/nHkDJ4NrlrCfXp0ohMKtrxFAf1MbYnOkpcvvLa33 AKq2nCHZsv5OMX25C+vnGkLtkn4KhNNQnVGdPh9twEPeKkeqSVG1fYR83WX0oTDrv5pa CLWA== 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=msUKJCw3xO9lQGZbNNGqWVWWialELGV7wlk4knHTlzw=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=gu94Qr7xa3odAmRElLHX3HuxpWVwk2gZHNjcLyCUySq8iHRx0v+3utcTPVmWQ+Jb8q GX1iNt8ZP37EcYdJBDo/BZPElORIUyHTtCSJunGsPtJizmBKkRIyl0CcEsLtzhExv1Ah ax9C0Yq2faHaW10lDwkzFpYemla9qakMJThs1fEa+TAvqJvud/mS9DyvI8PfVTsuTAd0 oNSvw/KmYbiwq0LTkwEardV3HPxn8sHJ58If5V0xer+UXk+35u08OI6r5jS8XnsW87Hl cMoLwVAsD2kS3UFu47xgj4cqbX6Wgb0kcbpa1eXzpLzfxtNdsFJOAMTZ/5/kdPDL4Qsf Fycg==; 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=eLKR+ecD; 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 38308e7fff4ca-2f75c09c3cbsi12059061fa.521.2024.09.08.18.14.11; Sun, 08 Sep 2024 18:14:11 -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=eLKR+ecD; 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 21C7A68DE01; Mon, 9 Sep 2024 03:56:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61FAE68DD2D for ; Mon, 9 Sep 2024 03:55:42 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-374c1963cb6so2256912f8f.3 for ; Sun, 08 Sep 2024 17:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843342; x=1726448142; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=fMcFCaa2sa847KBZxtJQlmitSpUgqg3E1kopM41StxY=; b=eLKR+ecD7Xoxfo28XWjpk/ocsw9oEva5ggSectLLwkoZ97SE7Jokx0JMLcWxvtMCP9 /HolwggugoL5KhV/UbMmCE9Gx4tfUwxZqAROYDkfYgCN51Lxr71/mpHbEqB/h+kCbX/X X03o1s8oi8itGOqtvmx3z3Sfjeltn9zR4Sj6RaUBiGUcQxfZ2zwtneLK/nqtAnjk4j3z /wJnx8j1SQvCBDMW2YrVKMHtcAajgKZZ0fjvSPBNsiif++ZLo/lyiOeSHoPbSaemj7Ow M4hcyB6yRvf79J9z45fgl1LDp38mY9HXMKRioq11qhaO4mS++Va1h4solPmWuailjuAU f18g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843342; x=1726448142; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fMcFCaa2sa847KBZxtJQlmitSpUgqg3E1kopM41StxY=; b=Pfp9BgcSZ2iXKhmBjAp3ykPiLXpDVopNoGFkXJjS8GuZKdJnk0Lkq9f4pfgUK0A9gx Sdpw3jYX8XZRk+JcsjZ8eQG6NOIhTy3rBXRTPZcEgRnqRzw5/zM9jIizVdAELYID/556 mbAIvZYvHJ+UMIDrwR2Y/Eu/EluQGCNMQNxa6k1/+ga+lKo1huCnOdlmhtjzInmuk0nO TH33bpAgHruwePjnshC6kZPeksiKUF8CzEZMSuPA6t4Q/jNRSzJ4X0K9N+FbW5kCeYwu uoYwfwpzqfqkVxGRlw+azeAyYsTpNRE7L0CX/gaRWHTyHKba3e+ziDkC/bAYV+26qHRf NBhw== X-Gm-Message-State: AOJu0YxNLocQd+qQnLQxZyD4IG7QqVM6nth2Bs3fjkOEuDO+znwOB3R8 y3Drc4/ZAVmx7hjPpsWnVYxChGxV3ipgVLffnf0u1E2Q8fdNlzGVoUCoLA== X-Received: by 2002:a05:6000:184e:b0:378:7e74:cc25 with SMTP id ffacd0b85a97d-3788967e4e6mr8778763f8f.39.1725843341679; Sun, 08 Sep 2024 17:55:41 -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.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:41 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:28:11 +0200 Subject: [FFmpeg-devel] [PATCH 44/60] avformat/vorbiscomment: 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: bMVRIJFU3qoo --- libavformat/vorbiscomment.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index abe12fd586..af51c237e6 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -62,7 +62,7 @@ int64_t ff_vorbiscomment_length(const AVDictionary *m, const char *vendor_string return len; } -int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, +int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *meta, const char *vendor_string, AVChapter **chapters, unsigned int nb_chapters) { @@ -75,11 +75,11 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, cm_count += av_dict_count(chapters[i]->metadata) + 1; } } - if (m) { - int count = av_dict_count(m) + cm_count; + if (meta) { + int count = av_dict_count(meta) + cm_count; const AVDictionaryEntry *tag = NULL; avio_wl32(pb, count); - while ((tag = av_dict_iterate(m, tag))) { + while ((tag = av_dict_iterate(meta, tag))) { int64_t len1 = strlen(tag->key); int64_t len2 = strlen(tag->value); if (len1+1+len2 > UINT32_MAX)