From patchwork Fri Nov 25 01:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949990pzb; Thu, 24 Nov 2022 17:34:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf6O72z8opTQhr4W1GaejIhoOmF5nOc23tHtx+t5i0MlaSCzp/oWLPgYQWm6h0VfQgjMLR08 X-Received: by 2002:a05:6402:b4e:b0:469:7e00:525d with SMTP id bx14-20020a0564020b4e00b004697e00525dmr20935117edb.157.1669340089147; Thu, 24 Nov 2022 17:34:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340089; cv=none; d=google.com; s=arc-20160816; b=YZ0oWvi56xXNzBdLIg7XZAiEpCKjeF41nzVB0YtVrjpY0MYBUBRSkrvT8pzPUfbOWw PT2OywxCHcJCumUXTwXw4Vg8NDXGX9C+Le7ogsJBr/PuFon0gLwMRINyZkgbQ3AEgY3b 8VBc+Puc9Bf5OKlw6YNISgwAImpIxsEMVEBtjkAoV0wRAoMW8YJ+jYD0TEWlhDCOZsrG 0P2+WTu/AtwSBEsAhaoxZmtDOZO2bUQRNnSMx+L7+/VBmqnsq4qINwLWV8oT3XhTGww5 gxaVnCH3/94UuJ96mpLUHdg0vydze6F9nzu1Z+YwH7lCx86oBcdTFCeDBMHW5ajguaEE llfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=djsn1MPA9pybNd2lORfcGZyitq/nU5rgpYNYKs6AP0Q=; b=q7S/8p7+I5NilYw2vZgZmjbAvJ6KWvVkyan6Wzf70xSTW8aKjQP4+1764QZIiDusCS Xlx1PcZo89uaf0YGSwOYmOECtZhlIKFj1gbxJU0aYmjMYVDrUbRpJ77VZ4YpW7HxXsN6 tsT2P4hTcwBcbc+OeA8DvxUNuOIBFMtq/w3P4jlbj5zjS0XmLPiUdK20iQ2JY/zZhrd0 hId0gnW66HE8RrRYZO6fWFtNpq2lilEK2GeIxn3Iu6HV0nV4yRBJbezEzPnvPBAH3jAm kQCFFp0glNyycw73rpLJFcvE47OSLfX3cQ7ePXz61sHDXazbajWevrQ76+q7TU/YbU96 C77w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dpGj387p; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b20-20020a056402279400b0045d4a88c735si2532328ede.220.2022.11.24.17.34.48; Thu, 24 Nov 2022 17:34:49 -0800 (PST) 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=20210112 header.b=dpGj387p; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BFDA68BBF1; Fri, 25 Nov 2022 03:31:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA57268BC1A for ; Fri, 25 Nov 2022 03:31:13 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id kt23so7238641ejc.7 for ; Thu, 24 Nov 2022 17:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hrpBBK3SBN847LZAuL/qymlOSj2nIAa7BzWJxGkJMNc=; b=dpGj387pVEXEU0GpiziBmPmAqabw23DJNiAreXExP5wn0fpHg7HG6bRcQDVzuwXAok i06jKnaQbFV3ReiSfbtNjGehky5VWef2kQgvU/ufocsx81YSJBllnX2LPId3Bml8IVOS CxWilmVnhgDYWXDV0fqLjzQwxJ8x2t1YsnKsmNUlOmXXy4FAj7lVfVyz2tsWcD9YT5Dv +vJUcgxfQGJwqcXaA6gZdBh8bl/tKYTsGn+jGqdev+C5ka1zmSAhYdeyr4CfQ1WiZEKM 4QlxWU6uoXH7hRqa4no7QLvh50eCtLokwg5+ugHVGe4eTOIKxbqb7u5vmXH57bgrRSDI ALuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hrpBBK3SBN847LZAuL/qymlOSj2nIAa7BzWJxGkJMNc=; b=pSST0tdIkSXFTqV+Vfn5oywW6iHS8n4sevNp0oJMvbG0PTHsgj1d8c3YSpexHEqeMO pRrMp0oOZlGJrbFOG6YI7G3+6Fi5yDKJV7soTZQs9N/AlDLfnUpnrWCoS0UEc2SGxLzI sUNpzYWoDkx3ZbIH9sszwTY0I4IsqIiHb3vCD2ba22Unpyf00B+7e838EkXVmkQ+xc/+ cjMBbYz5dQpi2yz6C8KHQuSjuws1EoUPCzsJOBfcotYOgEuQHl220UEW/ztM0KC0zPqE 15YhY+4/hlOG5IlT0EDyVG1NUJbBBoKLJxnpcgoWNYMq+S9LPafJsr/0kqJp5KYPC1Uv Vn5w== X-Gm-Message-State: ANoB5pnuJPu2ba8uWLqXL0HSNGGtfE1S/0K6kMD2Gp0lJH2aUkfreoDf D+RqqsMydmiXpdRghHJclVgMJZFepyU= X-Received: by 2002:a17:907:1dc6:b0:78d:8533:be13 with SMTP id og6-20020a1709071dc600b0078d8533be13mr29508075ejc.716.1669339873401; Thu, 24 Nov 2022 17:31:13 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:42 +0100 Message-Id: <20221125013046.40904-28-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/31] avformat/apetag: use av_dict_iterate 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 Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q0rn6U3WFN01 --- libavformat/apetag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index e861aac0f8..f2794c46f2 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -175,7 +175,7 @@ static int string_is_ascii(const uint8_t *str) int ff_ape_write_tag(AVFormatContext *s) { - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; int size, ret, count = 0; AVIOContext *dyn_bc; uint8_t *dyn_buf; @@ -184,7 +184,7 @@ int ff_ape_write_tag(AVFormatContext *s) return ret; ff_standardize_creation_time(s); - while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(s->metadata, e))) { int val_len; if (!string_is_ascii(e->key)) {