From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 09CB644DEC for ; Fri, 25 Nov 2022 01:33:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9486868BC4C; Fri, 25 Nov 2022 03:31:17 +0200 (EET) 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-Google-Smtp-Source: AA0mqf6BWz1l/zcj4H+XreHEcUYm/UrdWi1xZnZOhhUd6Lz64PrgBhsYxoVET4cH10xqPyb2weqopw== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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 */ -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".