From patchwork Sat Nov 26 14:46:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39541 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374576pxb; Sat, 26 Nov 2022 06:49:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5b8fElf2cy3nbOtTidN82Bjxpv50DH1DXM6ha4ZvY5JmerAGukn4RPuuoOt7tzAlmP/6G8 X-Received: by 2002:a05:6402:520a:b0:459:4c7b:e852 with SMTP id s10-20020a056402520a00b004594c7be852mr28036039edd.347.1669474173649; Sat, 26 Nov 2022 06:49:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474173; cv=none; d=google.com; s=arc-20160816; b=LPK3SaxZunUDBRwkRlO8i3ufHKZfrO/RbD8UZYwWavhopq+yAKpWUKwgxvMH7SmCK+ 33xkstO4ceC6u2j1wwO9wnBLHs5n79Pz5EQijS365mEjNtAk5xkjp0iBC6r33V6Cb8Km L6g4EM6DwuAjjUgqVAQSlpu3TJxau+R+/TwMRnq81Jp0qkDcbC9j3c3RkIuGb3WMzd7F DmPXWx37Ic/2QDwg4WJfWiwNOAy3ogx58w5c7cj41McrkmrZXsyQDpdXzgMW1LXV4ozi 8A0eWF3btXWRt8Q/xRnIurvLkHgNZUHQIyuPKxGbx9xMCB4yK7jv9AgrN/ooUMqj5wsT 1NPg== 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=QgxrbYG7MCJER6hWTGLJoTo2hNogxT/STQ5Mi3exnhXXOPsrR/KjBp4Gp28rZu4y/l COUL+Geg84PRB3Vt6nJAxdfOTvEcgrivqkLJdZqaNO+YJJJ5f7TFEgdm0rUK5wEVLTya 2w5wmfR1ZTjzKngqpirVe482mrhWJszytQTkpgRXgvS+MO1tblsTIMgzcHdPO2UW/dBT azVHWt5EI6cDonMV6Xw60Wzoy60jrCYKIX0fcPsBEKmmwQIt++ilMqgGidSN5YQUSXOY idky0yXegsFknZUxEzhqeBhDCDwpcdYh+a54BXejsCQmaoI0YEyzJ4TridKUvsH/JGEh 9mSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Hax7/2a7"; 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 dd11-20020a1709069b8b00b007af15567a5bsi6521465ejc.432.2022.11.26.06.49.33; Sat, 26 Nov 2022 06:49:33 -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="Hax7/2a7"; 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 51DE068BB3E; Sat, 26 Nov 2022 16:47:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C41C68BAC7 for ; Sat, 26 Nov 2022 16:47:11 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id z20so9868068edc.13 for ; Sat, 26 Nov 2022 06:47:11 -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=Hax7/2a7JBeFeUDfwTNh5YJ+vO9TY4CmOXoK+s9X38qGwTw+trOpWjn3Ze7oKr/Sh9 8v5lKRcFTRwlluBue0ocpprq8tLAw2Z2paboojKp6cHONqpHuyKF6tmGHQ/uWAdi8GRi 0TKSaZSpvV2hPcJmMyP8ODBs046+B9XmcH6jlOrP6Oy2i/jPO87mNiPEQmJMCNCu+yZy hFlBdBdxl9Mpm9C8yI9QcGh6ndPgSwTErssLixsFGLT+t9x0AxqqwAOt4r69GHwunBG4 774PC16wkTlhTNCgGnWXQG9rJEZYcRYofy233NAncH6erwYUnUcaOKn1+eRdr9rOg29M 8O9Q== 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=zAYx97dXh9+jWPuSKsyactpACRhr7cyqcej8p31RQqSF+br5uLU6fmCze7vYYtE3gW CM1nFjtrcXtghdatUTzxMz8et2IOhU9SgBFyxM6JaSLpiuTLrYJkQzEEqhJNt5DYXn5y w6TYUq+RkHLGBuZ36kI3l78NchZqja179JIBFpzZ6nZ40rVLP4EWLhUQUiKF7b9lz8IW BkTRkpYRU0egJNL3JUr4PZYB7bJ+Ktqo70xbP5OYQfTOnlzbioz2Izrzf9jnbivjEJoy 7vEUcmVFYhecHCDFYSzfHF6j1u0po50psZEVzDQvRBlnenTW5aGL1Yac6fq4aurpsHQv r8Sg== X-Gm-Message-State: ANoB5plkxNo87jhG5AaU8+4uHF43lYcaSVPUVUgBykqAhae3nLLIZSYN FZEN5/Pl9J5rwHG+PeIVji2QlzGWe1M= X-Received: by 2002:aa7:c78b:0:b0:467:97e4:6339 with SMTP id n11-20020aa7c78b000000b0046797e46339mr40182568eds.381.1669474030659; Sat, 26 Nov 2022 06:47:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:10 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:35 +0100 Message-Id: <20221126144648.73162-19-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 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: zrWc06G0nwCE Content-Length: 1204 --- 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++)