From patchwork Fri Nov 25 01:30:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949355pzb; Thu, 24 Nov 2022 17:33:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf6luxc0A97yjfOvbFdeckUpnHr0OEU7/fNBI6q6iMhzczGtXKGXn4cfuwBAwUIC1XcbW+ct X-Received: by 2002:aa7:c78b:0:b0:467:97e4:6339 with SMTP id n11-20020aa7c78b000000b0046797e46339mr32196751eds.381.1669340009787; Thu, 24 Nov 2022 17:33:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340009; cv=none; d=google.com; s=arc-20160816; b=UQBzcHgJ5uwQqnjKvXAI8VLB9nopRxyoP2Ejss/Z35LpaTpGKxGIpgzc9TW5cVP8IM TElZeJOd0k/qEoSzVXo9qQ56KY55FmFLnhrTKOyctZEKSeOFq1VffbMnKziLh6e5soqw 9MC60/bZ8Ua6RGicXPESdOLtJn8dSVllLCOsNSBWWubamr5IygGKxPVlHdm2dtkvp3E+ KIRP0lAYNNSSH3PxaYUxTkHZHXW2gfkPLC8pgDiKcRpAdPeYoq/WMpSbcmUNJoa4b3/P YC/hbCrdbXn6+CuXs/oVavC73NQeXxUWFIUQdjCu+JVFgqM5Fq5Hl0s6tw/LKsgydTkh aTHw== 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=B/bIK/veN2wLXjcNazkGzm8hS+Wxije2mHcPwrI9+eg=; b=NFxuEzTXLxjvvF+n8+O1rnM04fyMplnv5ebkEUczb0G1qll3pWoNc7ZwS+gDoFtPLA fzs3kSGZG0J8fq29Io3NxKVPI4N3e0iPy79YIOGNg7bw4h/lNL+wT85MOc/O29hp9Klt 7hhYrNiJbJcLCduJm3s/MNcu4PNW9L6OUKYD3NhYaFO6IoTDPHWxhHfqI0hUV4UI0T7c 188O+mluQexNeRcRKFJ5nldlSyCnz9GpcwI4rBeZHnMQ66HAp6EoLPW02fd6hbOfg7kz mEdACNvpzrtt9CTyMVgae7thGkyTGwG4WJ4f2Inh2WeBD+lzqT+kmn9dzUPpB8rBNz/6 ltaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iuZ43e6W; 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 sc2-20020a1709078a0200b0078c3197bf86si2117602ejc.533.2022.11.24.17.33.29; Thu, 24 Nov 2022 17:33:29 -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=iuZ43e6W; 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 C2B8168BC4F; Fri, 25 Nov 2022 03:31:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB4E868BB03 for ; Fri, 25 Nov 2022 03:31:05 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id v8so4508079edi.3 for ; Thu, 24 Nov 2022 17:31:05 -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=itn+euwLExplmMk+QaeoQzEnn8eZwdG0yrFUBRgD2v4=; b=iuZ43e6W5Ls4tYHd3m5SX7J9yd7lJO0JbIbZ5rDJ7mqib5LTinKbIrOVBjDS2dzhE0 kA+tiUYMMToZd0icFYzluf5rQlzwtdMs01vRG+9hyOhjYFfPu0ncQ1aj4L4pqKi8qnYA xBYrBrIsSRDVNwcAPRwpxfmwHlkwN9sAYwvR+9yKg1zgVRbd1Tfs5CmeZ6ZnWl47Sn3c SHwHJi0JF1BHOH+P5ouw33tT36RpWKuLZqlvfT6sKQiy6YNBPOwOJSembvB/JZjLAgjY pwl0pcUI4IMDumZ17ariTdL8Npj+DzzQNR4s12EkSbb62U9Wxz8qVDgM9uvsBma4FNhH jJwQ== 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=itn+euwLExplmMk+QaeoQzEnn8eZwdG0yrFUBRgD2v4=; b=0m6YrFRglKgchY0EHo/ItMNxc+GZdzz5l8jmgpc28pw8tT6yI5XGeduDs5dKXvSMiD s1+h8EeTRffjEFwXV5WZhZSDDFmEgD/4bKcEuHsXcdsFW/SMS5H45OxR4xlLgtSpNOyy T473U4mcYwnlksTP/9VVoDTQ+xhFudCpU47OWUpJT8ca7gr4MJND8XUupOASMEL+eNdy I7QHARME3V38b1hkwSwZuvbUZdozbz91DQX8NsTvUxFSQwe3o/CG5YjL2o+hfTL2eT38 xkrdfXe+7b0UcVmW05Lr6Y4JDhy3Fm/GXUTYXOLApAaPVBIdXEJMLK8LzfqusKQCBG6O xXnw== X-Gm-Message-State: ANoB5plOaQP+e1LNYxfDiAur5kw5wh9Bgj+JVJgCFXUes/87TXWh2/jp D8mVhb6oROA2GmCljHAqQWGLxd2IPwo= X-Received: by 2002:a05:6402:5007:b0:44e:baab:54e7 with SMTP id p7-20020a056402500700b0044ebaab54e7mr15873963eda.265.1669339865022; 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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:04 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:32 +0100 Message-Id: <20221125013046.40904-18-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 17/31] avformat/movenc: 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: t8lwVaHB0B3i --- libavformat/movenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 064b541972..7b00e65cdd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4110,7 +4110,7 @@ static int mov_write_mdta_hdlr_tag(AVIOContext *pb, MOVMuxContext *mov, static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int64_t pos = avio_tell(pb); int64_t curpos, entry_pos; int count = 0; @@ -4121,7 +4121,7 @@ static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, entry_pos = avio_tell(pb); avio_wb32(pb, 0); /* entry count */ - while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) { + while (t = av_dict_iterate(s->metadata, t)) { size_t key_len = strlen(t->key); avio_wb32(pb, key_len + 8); ffio_wfourcc(pb, "mdta"); @@ -4139,14 +4139,14 @@ static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, static int mov_write_mdta_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int64_t pos = avio_tell(pb); int count = 1; /* keys are 1-index based */ avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "ilst"); - while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) { + while (t = av_dict_iterate(s->metadata, t)) { int64_t entry_pos = avio_tell(pb); avio_wb32(pb, 0); /* size */ avio_wb32(pb, count); /* key */