From patchwork Sat Nov 26 14:46: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: 39539 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374068pxb; Sat, 26 Nov 2022 06:48:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf6SYqiD6gmdql3LmuZOG4vhjP3Rbt7MCzYAHH3QPjlKPXk2oehHOxkAYJc7iX9V1T+gFmb0 X-Received: by 2002:a17:907:d047:b0:7ba:530:223a with SMTP id vb7-20020a170907d04700b007ba0530223amr14756770ejc.215.1669474124800; Sat, 26 Nov 2022 06:48:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474124; cv=none; d=google.com; s=arc-20160816; b=l67YS+c5QoSYF/TdAmhsnPoBex2rgOxawgja4qYSpz8U+l6jFw3KG2FRUaJt6zl1dk EomMh+vwDebS+ydnES3W6nYkCCY58Q1omeEHYU+6M95g+EmovzowpW5SJTpYIMTO4qw3 MTIuNtdyvy7b32c6f0YG8bvNJnAMMscvPwnrh/9u9DLzlUeW/MsXBWTFlaBMIZN4jsL1 F6OclIIojv0VBNIKx19VZY1BKwwiBl2a8Da2L6teLtTLtM5fz7x8u/xleWPMvI5fS+wZ 6hA6DBPHcnIIJINGRZED3rapJenm6YwFX8MZNofCFZ4N/BTK8MKGX3saYjaxirB/zQe6 A/yg== 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=aim3s+A4ps2TrnUrVJ+N1KfMgFGpT8HIpVz5LrVCOU0=; b=QO3uIxZJpd+2veDEiunyw4qR/PrTcvdT3gRI34hHZf1hdJfdTvcR/EwEwAWM2jDp5W AmEOIxlqIgggJ651Q3QaHX22Vi4dvDDoR4sjaln1P+kopGnoTEI9P5o67DPQ7k1iaGIe 0OfTny272Dwi14c287Kljx75GRone3ySoCxmOPM1clesnF3H+XXkRvMtOrt4PG89SgRP C6Y6EiJvDSa4d+OuOsWp9hJ8wPeXVC8X5oRslHVhZ6nNsZhNlol1qS/j0rwenyzka8ss C8KyC0hD+KvSfzZpXM/2JZ/TMz6ZN+s8PkOt2oSJFJyFxvhB4GVLPGFeO5zKx3QzbnYn Ga1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=llmKUDG8; 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 d22-20020aa7d696000000b0046904a196b7si5508612edr.272.2022.11.26.06.48.44; Sat, 26 Nov 2022 06:48:44 -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=llmKUDG8; 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 0A06568BBA5; Sat, 26 Nov 2022 16:47:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BE6C68B3E1 for ; Sat, 26 Nov 2022 16:47:09 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id n20so16180332ejh.0 for ; Sat, 26 Nov 2022 06:47:09 -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=zzT1C9xStCn93ptLg62c7M0IXqAvZAoahmXbnBxNeOE=; b=llmKUDG8zbhjvzotzctsiFtfSiAKBrWG2/CsJ9ZdkeSVZKx465a1KbQ+hGtRofk8y2 JeDP2Sy3YBN4xkRTWMtd0t5r0tj0uVcutiyng6ZxkjmJ0on5EeAYgsNb/DnXjmZq/cg3 +7CbtbGKskDzCYVyWXBspA3REy2DQr40gED2woUZcKVkj5wbOkqjiMJULaXj56OoptT/ P0d5YdDNvX+cLFgKVMTJH1vE6RSCgakA2gfgVKN5RxFlHooqaIi1eWIKHVCm9UJLvuQQ MviI1TGy0VUEpnlymIV06SfZuI7l7YNovPi/Youpt7sdRJ+fjGHHoFXNQjCgF3NZO+Ew +Gvw== 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=zzT1C9xStCn93ptLg62c7M0IXqAvZAoahmXbnBxNeOE=; b=iqNJa8rJD0iMAIsov+zD2zGO8mIN7ukyzsmMxcBpKnzDZOVJoryi75WRQ2Gv/jrr1f HuDyXOG9oQHBjuAbEyqLgjEK4q2JYg16aGhJnYbP0PKLH9ANOwGwR4hGOoQSxUE8pTH0 dxaT9B2eG9jdN9/UC85z9IXHCgMveJH+GAf2Sq/1PjpaTNtEEkwgo4Lrkb1e50nEYdJg pJ67jM3Dpml4UJevAQQ5EOeNPLJfIEfnnc5z4bXXXLIAOO7dSO6TZYVzq4qqaQRz8UkC yPh7mc1KFlJ5K1qxdr5HEDBm3Qmj1VfCNnulqKorKl98/q4WL58yWn6y1oin062stX31 CTMg== X-Gm-Message-State: ANoB5pmfwqHhFmXaMX6AYe16cGA+bwimqQOEueqlIcl6dJsXTRVHQw0+ ECM9B7S/JgV/40oHuxGg258DsboQPTI= X-Received: by 2002:a17:906:edd2:b0:7bb:1424:b112 with SMTP id sb18-20020a170906edd200b007bb1424b112mr11991586ejb.168.1669474028563; Sat, 26 Nov 2022 06:47:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:32 +0100 Message-Id: <20221126144648.73162-16-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 15/31] avformat/cafenc: 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: +/+n92GN/Gmz Content-Length: 1716 --- libavformat/cafenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index b90811d46f..b8317cd5ed 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -113,7 +113,7 @@ static int caf_write_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[0]->codecpar; CAFContext *caf = s->priv_data; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id); int64_t chunk_size = 0; int frame_size = par->frame_size, sample_rate = par->sample_rate; @@ -195,13 +195,13 @@ static int caf_write_header(AVFormatContext *s) ff_standardize_creation_time(s); if (av_dict_count(s->metadata)) { ffio_wfourcc(pb, "info"); //< Information chunk - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(s->metadata, t))) { chunk_size += strlen(t->key) + strlen(t->value) + 2; } avio_wb64(pb, chunk_size + 4); avio_wb32(pb, av_dict_count(s->metadata)); t = NULL; - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(s->metadata, t))) { avio_put_str(pb, t->key); avio_put_str(pb, t->value); }