From patchwork Sat Nov 26 14:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219241pzb; Sat, 26 Nov 2022 06:50:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7aZqeyPVzbCwd1NCkSl6VckHvIOFXuD4r1j7G+yu1b/gtylkIJ80HPLPN/Hbc4gAhtGGSh X-Received: by 2002:a05:6402:3719:b0:461:4f34:d8f4 with SMTP id ek25-20020a056402371900b004614f34d8f4mr41405055edb.144.1669474250743; Sat, 26 Nov 2022 06:50:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474250; cv=none; d=google.com; s=arc-20160816; b=lj4SYpvxTzKye6xxMJdA2MAGju6zA6dihRy+3v6OmPgXjEbIC1odanMdw0EhHOyOqM kqYErUyQAs4yJ89aSqQVJhd2aw3NSzRsulsfTsv4nWgYYmUGCGJfej9m6/Fh/A7YM6us LSdaR6FbGQDUbH4ICfAX2jrtot/MUZ6Ro76M7KXYb0ION8+RyOY/gp5/EgY1By15m/aA Kjf+5zuu/YBigxXfaRE05GHydDAkODkVxtcmQ1Wxiq7UwOXC9EcQaKgN5E+ZreDy12jy 7Y9tipUv+NlEtc+uoXB6OYyVgQ1vDajmG0POC2tU9ZAT+TSUgOft+1x411PLpK8rDSTn uYng== 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=SklcU85GH3HearKdOCi/6A/mSxv5rHjZhcjai/Y2vDxcksJOdQqufGb16Cz/2STPtM 5v90Uu9e0KKViHuG17+83sjYVYk75SEItij0zEzrOB8im2uQakXjJ9KgSAAOvbA4saYk BfCJjO/xDpOFmalBZlYR1mN7J6hD/IJ/qN7S4JYcAvBAiwWHktPfsHi8LCvsVKKPaQO5 pLdndmDqeJWTvR1vRlxyrLBeVGvkbzCOhRzNd+2ka0f9wkDwJWJ6uf8Nfl8iwdrdRZN4 vjGXs4nH6clWLTRwlDiyRz6kXdYzxzQqIzyu8B9i2VwCATKLMBy4lVzWB2rd3k7WKcQi gKbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BLoKnA64; 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 eg48-20020a05640228b000b0046a353c3b73si5448771edb.280.2022.11.26.06.50.50; Sat, 26 Nov 2022 06:50:50 -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=BLoKnA64; 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 D958E68BCC2; Sat, 26 Nov 2022 16:47:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 986CF68BBEE for ; Sat, 26 Nov 2022 16:47:17 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id n21so16050716ejb.9 for ; Sat, 26 Nov 2022 06:47:17 -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=BLoKnA64VFLWnP4ekkRfo/eZJZ97l2TEWr19BSAVqJVxE4U4pZqmzZ02fjvWZU1xoF CHdk4LtGMK8CPSeExlLrKMsGd5W95IjPvaCB4Gz3WV64ccZZlxizdQKu9Rqja7dOGV+L O7xDyPOlCxbQJvt6lrrPu6I948NwLDYbZnUmw95vU4WI8Ku0JtEgKhwjVvHMuqLooFty 5o2+FkWJNCwntrxkdk7g2Wp8MY6U6wc+vs51VcuppGXKGdEmjp9krxfjZCP7d+1vkrzu w9Qee5UoYaOSV+wzr7AV4G4EzvXLObxbhnsnHZVp+/fkXJK6zRWxM/23wZnFXZn2mRgH i1/A== 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=2T/LgRnvOQqxMPJ0NL+FlnsMa+DssmZ38SfFtfOTK9LN4dKiwkWE5D5mmJZnigmAq3 Jo7Tx+YdEbdJzHzabEK1g4gMPxy6dZsQklfCI1Nw8wiF7g6mJidesE/83dZGBFfuMUlJ T/tRdPG8sxKucb/j6LlSPlD/u+/ory8l6bJUflzWVeE1/e7XQfOKhqPaxz2bgmR8Gz0U Bze1DwJZzRYYTlfAqdDrG0Da8M73tX0pa1VqXzBsNJluAYKjASg8q6p9a8C5PijzNQ8W TTzyBrxHyFcLv8mmunIjM6dUggLdnbULEhvPnLSloGbq9IWuOxL2BrZHz4k26Zg1s397 uepg== X-Gm-Message-State: ANoB5pm3dqeo+M63i+hhYC4om3dAf87P1cTrYUjQYpb/bsk3x+Hh/p3c Ikx/9nUzh6W8Z6TiAHnRrWQ0GPeMzWk= X-Received: by 2002:a17:906:fa19:b0:78d:9002:fe3b with SMTP id lo25-20020a170906fa1900b0078d9002fe3bmr32987073ejb.769.1669474037019; Sat, 26 Nov 2022 06:47:17 -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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:16 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:44 +0100 Message-Id: <20221126144648.73162-28-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221126144648.73162-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> <20221126144648.73162-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: d7j8jxuKhcZz --- 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)) {