From patchwork Fri Nov 25 01:30:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949436pzb; Thu, 24 Nov 2022 17:33:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf42LEYv4+jnUt42xxB6P1XGMW0tcxPy/c3TvTfO6bxQkDSlwJolbLU19R2hSHGzIZyuZHXf X-Received: by 2002:a17:906:1355:b0:7ae:f439:320c with SMTP id x21-20020a170906135500b007aef439320cmr29575590ejb.452.1669340017350; Thu, 24 Nov 2022 17:33:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340017; cv=none; d=google.com; s=arc-20160816; b=r444WunNRv3fK200Jn5oJZATac6nKKVbTD5jlzTElouIDWzU8rwSJzBfMbKFVXH/LQ 081E9AK+SJQFUcz0y9QyfmS46YduwcIcMq4TTg+Py0lrJEaueZtJ6v64ezKsRHKslrMv EORtmeVZd6oYgLwWuaxu8lH5jogIcytkIHU4t8AQvJCZk36qhrG4iS5WtSY3kqANW1vD xIZIyKAfBrewsEHM1TBl/a6+SlSYEszcMi09rcNeeRyMBfDnQJBZy6k7Tef4FJ2v0KAl 884wJnEm1+CsGugMMtWGxrVa9f+NlseIGGMwvnOChNukoX9HxQ3dJlUX3OunFEFmb7rK Dalg== 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=Wnq2VwfVjDspINCfrh4u3ksBhJvXzJp78fgoAH3XpeE=; b=jKIkWOhvU/2JknxphOu4JsnrU8WUDlYYEHRteUmTIizsNosJrjRfMv4iF1Ek8cKvar K5v2qc6JZIQlxSgNWCj11RjXS5/JFnJlPNUaJ/OmSRr/aj3dyqaR8mQ4ME0WnbEXiww9 ThfHC5tl2UML3zEYrQh4u3PRjSq99b02Uh6YINAg4awIuy1rdCLDS9dX5VsCgbY4TwXu reSkqC4g9fgfWCmlfkdJYeN4fISurVFoIw1AlaeExz388MLRGbhyEori+Zs0zLrLPswM C0z0lbtVH8BsQpr4SaJYURUgY9YsVZQkNXTl9Tbat/E/4Bt3S8SVOibFalDcGxTeBl9+ WiaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EcWD+i9m; 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 k26-20020a05640212da00b00469c41d538bsi2005814edx.180.2022.11.24.17.33.37; Thu, 24 Nov 2022 17:33:37 -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=EcWD+i9m; 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 B97A868BBC6; Fri, 25 Nov 2022 03:31:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2657768BB84 for ; Fri, 25 Nov 2022 03:31:06 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id z63so4515009ede.1 for ; Thu, 24 Nov 2022 17:31:06 -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=NJufz4NJaHmMwJDZEV1aFBRizUd/ZI9ltOt8Syw4F24=; b=EcWD+i9mfG/iVgpouPX5DP/heETnMScanBawJDWZoAsAj/uuxMPOval5eKLSWHNQt3 dgd7hh6AUyyrAVHpWEisv6LfvT34yYD1sFHyPki11UUp6IbNlGxQqX5H4MAeDLKu2evR 9hyrXHz3WJ4COPmcU9fKqCKbSecmaxex5jbZgpsykkBYjeYKX/u2cGvL1IXQ2almUxFT CMjQwPr9bgF28aMVxT0bU3bCBEkaGKtcyi3O2KYpZx/+fAcfrhLITZt9waiUCWy8yniR MZ5Ozb00z43PN/ite+Ss2Bk1XLHlBM0G7pVAOdntlVhpuIhLASN+CndMd50HhKU8y90a ch+w== 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=NJufz4NJaHmMwJDZEV1aFBRizUd/ZI9ltOt8Syw4F24=; b=Y+xej1mCcSLmw0So4ufM9G7pIOL3hOQ+17/eBQnyvE/b1WT2ofGXK6JRggpXquChAE KOM4rR8FVyxC+kh1I4DcehZ627i+BQoL/qYnlFoeBOHMcCVkALKHhn3kiN5wOfwOnTsE R71tUBGCX721yuXovEUPLdUVYVEYLlIwooGIZXVgHYdMvYbE3udOoLvBuheCUaUWv8Ln dcUwT2V9ra5gtmpo6VNGrvZkar2Ho9FEXszPgd2UHVFncHh/6+IVsTFNIoecpoV6YZle MOEeOUrrelsbFjBaj5ICspkwdkLG73ws4Rs9uixfVZiFs+KJOPvpW5W6/8UjRdOASiM3 BLIA== X-Gm-Message-State: ANoB5pm4KDJQuPp83II+IRwZR7pNE40fIHonTT5A30T99J63VrFn/Q8z LJ5GbAFGGDeE1E3iC9VxH5di9ZmdT6I= X-Received: by 2002:a05:6402:2949:b0:468:fb6b:3a79 with SMTP id ed9-20020a056402294900b00468fb6b3a79mr30996700edb.63.1669339865823; Thu, 24 Nov 2022 17:31:05 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:05 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:33 +0100 Message-Id: <20221125013046.40904-19-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 18/31] avformat/metadata: 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: xAKgG7YHgPEH --- libavformat/metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b9b6de7972..a0258ea125 100644 --- a/libavformat/metadata.c +++ b/libavformat/metadata.c @@ -29,14 +29,14 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv, /* TODO: use binary search to look up the two conversion tables if the tables are getting big enough that it would matter speed wise */ const AVMetadataConv *sc, *dc; - AVDictionaryEntry *mtag = NULL; + const AVDictionaryEntry *mtag = NULL; AVDictionary *dst = NULL; const char *key; if (d_conv == s_conv || !pm) return; - while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) { + while ((mtag = av_dict_iterate(*pm, mtag))) { key = mtag->key; if (s_conv) for (sc=s_conv; sc->native; sc++)