From patchwork Fri Nov 25 01:30:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948840pzb; Thu, 24 Nov 2022 17:32:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf4HjdcKAQpWEvytrfvEXZpCLyaD/Jbej+BdAKiqpDPVUhGolO8FvLNrs1cGODHQhKqQkdZ/ X-Received: by 2002:a17:906:a0d7:b0:7b2:7af0:c231 with SMTP id bh23-20020a170906a0d700b007b27af0c231mr28918180ejb.240.1669339946501; Thu, 24 Nov 2022 17:32:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339946; cv=none; d=google.com; s=arc-20160816; b=m+yCxHptwQhK2EO5xlProd2KXmFs8kN+X3xxkA0lAiGirkLiJfN2xrVHG+MPZ4BUbX BDqUsCmLcRwm1xEa4UmzZT+F4++4pQ/cofjCQkF3h17FIn/BXaNDQy1AEvu7dGKGoLMj M0Yr8VTBXNb2m8uCbTMsqP5H72BcIh22NAmYYTZYWX9DzVfg8nxGNGyjtHj0nmPLBZRQ t3npmM4l3s4idvOZJx6EXWlDc/EyA6J5jHhbqKzSUChf5z86e8SW06Og2AMo3YXQjP7X 4oQ44rVfsJAGyex73ItLkmoOHiRh7g6SxYs8FNXJtwZ60YEm8lyLTAL/QqwTW1IOIAYL 4BuA== 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=nxl/yJAR2PI3/+7SipZpBZ50y169gpUPdUMRxF9suzE=; b=QrzuqgStcr/7YwD/g75bFeJ71gT/buINDcZqNwHTv2ihxrhKg9wOLyX00n5Uw/MykO hBpR7US8Ud4UnAGpNvJLbCgA/oW9TZIxykBbrNri6aleOO2iLxtuvRQExTuuK790xl2O n2Dvz9IJW5RJzSd9ts48J4rSYaqkWA/8uWK2BQhieYQdAmC1bFIccfydQ6eu/9j6pAj8 HYrOaxgjexbNAj9N4y8FUJj5KnegAX5SewaiB73V/GD2UrH9BBzeP3HIi/TSrRXL56lZ lyYnfnROO7DtfUVABwh0W1kTb71NGtbZyRFIIP7HoFWoCiSUrvnj7jgMRnTsUbG7nAAX 5sTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DM783Yuy; 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 kl22-20020a170907995600b007ae814af686si1528039ejc.974.2022.11.24.17.32.26; Thu, 24 Nov 2022 17:32:26 -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=DM783Yuy; 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 6DCA868BBD3; Fri, 25 Nov 2022 03:31:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5192068BAF5 for ; Fri, 25 Nov 2022 03:31:01 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id i10so7248393ejg.6 for ; Thu, 24 Nov 2022 17:31:01 -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=0T3GmCt5crLf07hImSNUBki7vfPbvgucLcdCCzkuCM8=; b=DM783YuyWRkCzTxZWZEMHzIMB6hCfaLpxei0lGBFsjgt8CwCPjqaTBONS1PnHTfsLW mhs+e/JIm00re6v7bkrYbuUxRCzZnbGvWYqmDGAd6NcmoNPzWiFQgQWQPfSaiEOSlx9+ IlU3kRj2f4LXyowPyiEkkQiNKCYlT5egHEYwPtL7cyFpSoPqdJKHQiVTTjB/mtdLZi1u 52ZpbmCzR0N1c4YaxrIcV8n4ymSDuKI8ansTAgPEVtDw3n1RgX9svKliPo8swpZa44hP Aoq2iA/AHDD4EIJ6v6/89KLJEj5lJ+B9u1Bch7kA1Oa9Qzh+xO3P/9sH/hO6at2RpZ3b vN8g== 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=0T3GmCt5crLf07hImSNUBki7vfPbvgucLcdCCzkuCM8=; b=C865iOhL3AUk5vvo4NoXWXAKp1sEYc16A2JuRDNulTrHnzZyvTrqE9obcVPotpdsxj yUuRM+FngejRFL/LwOvaMlad4gmHlJaTO7cePG5KhR6KbMXSQs8qPLUuPMVhMz7Li5SO BEYU87DyuYKFahJsPcBKk/He9+WRiFCJ6ZvSkFxyh/EuUqkb1mwPM1Do7KlrqtCLrYcI Ey+3DgVVnStsPP67e45e5O3i/lS4foVpKuxOoT8zG0AlKzCXgv0dM60RtCSOc6CGbk6j PToHal6R6uPkw2hO1JWZZU7r1I7fyTCQeEX4azb3/YI1Cx+XbPRGEV67sgJaPaY78vWp kPHQ== X-Gm-Message-State: ANoB5pmllm7OkH8Sj0wKeulVQsAbJvLixKRerhXNQ+MIGAB2bdoNg6Y5 /wzNN5K/eQcWMtaaewUgQ4LDB8DJjsM= X-Received: by 2002:a17:907:774e:b0:7ae:39b4:7208 with SMTP id kx14-20020a170907774e00b007ae39b47208mr13852927ejc.766.1669339860689; Thu, 24 Nov 2022 17:31:00 -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.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:00 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:27 +0100 Message-Id: <20221125013046.40904-13-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 12/31] avformat/vorbiscomment: 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: mg+/t1LrstSx --- libavformat/vorbiscomment.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index 13ee065a44..abe12fd586 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -45,17 +45,17 @@ int64_t ff_vorbiscomment_length(const AVDictionary *m, const char *vendor_string len += strlen(vendor_string); if (chapters && nb_chapters) { for (int i = 0; i < nb_chapters; i++) { - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; len += 4 + 12 + 1 + 10; - while ((tag = av_dict_get(chapters[i]->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(chapters[i]->metadata, tag))) { int64_t len1 = !strcmp(tag->key, "title") ? 4 : strlen(tag->key); len += 4 + 10 + len1 + 1 + strlen(tag->value); } } } if (m) { - AVDictionaryEntry *tag = NULL; - while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *tag = NULL; + while ((tag = av_dict_iterate(m, tag))) { len += 4 +strlen(tag->key) + 1 + strlen(tag->value); } } @@ -77,9 +77,9 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, } if (m) { int count = av_dict_count(m) + cm_count; - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; avio_wl32(pb, count); - while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(m, tag))) { int64_t len1 = strlen(tag->key); int64_t len2 = strlen(tag->value); if (len1+1+len2 > UINT32_MAX) @@ -109,7 +109,7 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, avio_write(pb, chapter_time, 12); tag = NULL; - while ((tag = av_dict_get(chapters[i]->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(chapters[i]->metadata, tag))) { int64_t len1 = !strcmp(tag->key, "title") ? 4 : strlen(tag->key); int64_t len2 = strlen(tag->value); if (len1+1+len2+10 > UINT32_MAX)