From patchwork Sat Nov 26 14:46:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39534 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374391pxb; Sat, 26 Nov 2022 06:49:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf6mC/8HEFdvMfqHc3Ep70CDJ2IX26c2Y5AqKrhHM8LqnYYetk9n4KsECYaf/TM4yHAomGs1 X-Received: by 2002:a05:6402:d6a:b0:467:6dbf:e3e8 with SMTP id ec42-20020a0564020d6a00b004676dbfe3e8mr1744708edb.291.1669474156929; Sat, 26 Nov 2022 06:49:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474156; cv=none; d=google.com; s=arc-20160816; b=rvHDLLn8eVA1Cf3upt3MdhpeQN94W7cZ8xE1ajXAniCRO7rHDAQgZ5Hlc6YHL0JUP1 CDXBzsQJlG4wyU9BRgbUjjnnh0Sxy7uJktIV7KRrRArNlT+ZZbHl1pT9nE5Vxd2Xb8Pn kxyCdLoL07eb6/yiwL2ov7qGt8b1Xh64Go6liGyx6E4QK3pXxzL1jMkuqOrQ2JoJKaoW ZbI9g+sufcyFrjS4/mSnxoVsyt5NyIAZDH5zK+jyz17idlNpmMTJacXIqDR3RPoE1I9w 4hW7dPxuQI5gXiQDjOuUe08JiLavzSDqDUAlWc+8eGRl/GVmYBbpVqTtMaS3KB4wPmIp cRXQ== 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=IWSKlSJQei+XcOk3mWAW4r8grcuLH3PtvMh8Jl22v2XPPa9X4swgE+zX+kMs74/ijZ KLMBx9Ix2T1l+zMPHO2d4c4wNbDyMVPrVDXB4d3+GVU4uykqPUblXOA5Lq+epfPl5zaz D2qxnHapgQlLdbU+ACQN7/7jKRtEhnNSRZO/FGdlNZksQHnlw+R+KohQAp3N9ta6YwFC lRZp6ZjBR2FtFzsprozg4/aPNLA1y6Pn0tqmmVChPu3mo2R/L8hchZn4J1X4RLwumZnJ Ru4nVaJUCH1mToxOLGSUByydJX9lkZ2LAvBKYEX49MPWJVCY9PC2C18FXqlIT7jjsfNc 7Akw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Uh6ov5Xj; 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 qw14-20020a1709066a0e00b007806c141214si5036085ejc.153.2022.11.26.06.49.16; Sat, 26 Nov 2022 06:49:16 -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=Uh6ov5Xj; 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 5638568BC3B; Sat, 26 Nov 2022 16:47:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C88E268BB66 for ; Sat, 26 Nov 2022 16:47:10 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id ha10so16123416ejb.3 for ; Sat, 26 Nov 2022 06:47:10 -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=Uh6ov5XjH2hFdHC/o6Aq2AMRxM2zj++2WXHH29denJWsMURR3wFEq8zNTOPpWeMC7i 60fug29bnGrazkJqjXtOB/pm3ha5JnbapzMvYuz91rI+zesGPQ1f2+ej0z2JHh+K1UFb uJceblfy0LqVUU7Hue83CpXpsKOzaC7gnWWPkc/4tfO49EzOWAMtafKMz16B7xmzfZiA VIinSv9O3X7dlqoWfqzZZadjZdXaASfsHXNNizL9s3NW07B7GbLRX5EtpyOr92Tc6vA5 OMMuntmTdeaZYuv7E/w00v/SpxsRK8K/AEeAwL5gHYsq7zL56jjyYkxSmyTNmQAmlw/8 kQcA== 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=AZPafZ4o/JVW5/ai2s5AQkaOyOYSeSXXVYE6UctffbKWetn0O5G22C5Er87l7GKbSu DGSX2ZzjkAih8MEudQu1ujZE3b/g44pATxLCLoDGpmKzRq1dqOESzHFvLT3k6fqFb4o2 oCRtXGykOByClcdTh9H2jDoAALEOSSYh7YoYrv93B6OEvAfmT2/7WL1tjmPye3RB9BOj WnU4fB9JBvZtTqiOd7zrusU4iqe4UxD6af8r7LYFNgQMRIS/laDMuUVPtt+Syu8S+ICA w+9Fptv8AzdyvhKZH5pagW5/f+HIy2JfNZfFT0//Wxb101BQhkExz4QthHpOVoVzbB5X pWpw== X-Gm-Message-State: ANoB5pnK/CZJiouPYfNsi4R8GbRVKxFuAXPIlPZyqasOiHXcZVFqZ1gb iGBAdDw6mCHgbe66+RD8jr4KXtOaSwM= X-Received: by 2002:a17:906:1484:b0:7ae:6746:f270 with SMTP id x4-20020a170906148400b007ae6746f270mr23673266ejc.728.1669474029954; Sat, 26 Nov 2022 06:47:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:34 +0100 Message-Id: <20221126144648.73162-18-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 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: zMRQ2O7e7aYy Content-Length: 2011 --- 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 */