From patchwork Sat Nov 26 14:46:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217629pzb; Sat, 26 Nov 2022 06:47:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kn5F4eqgpWpgIjZC5r9dPrTr2/+i6BtgUXIZaOvIir0Musfy5E5y9QPeS/memix/nK5Yc X-Received: by 2002:a05:6402:240c:b0:462:2c1c:8791 with SMTP id t12-20020a056402240c00b004622c1c8791mr26819943eda.29.1669474078471; Sat, 26 Nov 2022 06:47:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474078; cv=none; d=google.com; s=arc-20160816; b=yvp8dssnWlbNm3CCFYh5lBoScFVGrMKsaxdLgPOnl3w0KvG5XMdntqpg8n0U49Jhan 8cR842xNZAgxDOKdEkUnopTPuqAy3kGPDp7/F8RUWQoJhluBa2V8S+5Jih+SWNwTik+i KbSKJXVugcrs50UwGbmJOqqjBXTu9cmEt26mzHlpf9m8TDyheavGC/vvch8BJPEWMRIM +i5OH5M27Mv/o5/Ey/liNcnUu56iH15NfHJx0KbBfNLxyH78vLWxwkVImo9VjvoazHwd WFe1z1TuWOgIIjfHnFZOkPPlm2T0bbfOMF1q7GVRB83jCSefq2UM+rrkxhSlJWcqcHrs +t3Q== 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=m46cnd8OP7nsnw1BdHJvzsj9RBo3fCwO60E3Ry/Rimnw0TfWpCYbkQ7laVeVNxkfjt vnVVri/r+sOHLJvklNNNgGc0OvVPL0UDorMWoGbPW2Cw5h3x4CV0fWKk7h0uvAR60G7A CnVHBcJ0wQs/5XgynLt4A6C75hDOBLqo5iMZ9FN0K+fs9gWONOA9h2c6+pNbp5fiGVUi DyJ82aUHXEDM6C/W0haNSp3Go3O/z4upgvhPT+Tv8aRSjel8wwj3IcxU7m7YWNK4b2PE WwZH7xu8IRvndcndcHN1knsfHJv/vzwMLB5qnyP4f6V+HcRegADdwPICUiNNFtgQveRT vAUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JBUXEgEe; 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 i13-20020a05640242cd00b004587e99bcc2si6800142edc.383.2022.11.26.06.47.58; Sat, 26 Nov 2022 06:47:58 -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=JBUXEgEe; 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 06FBA68BB74; Sat, 26 Nov 2022 16:47:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F228368BA7C for ; Sat, 26 Nov 2022 16:47:06 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id z63so9903074ede.1 for ; Sat, 26 Nov 2022 06:47:06 -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=JBUXEgEe0VFm9w6JH0xUl0T9YtMtHHlRy/rpVFY04Kgimyp7R7O4d1/l6sccW9Tyfe VpUgSvSCyCfqIjYZ9ZXj2I7PddTXre/REULdnmW1mcfFfS0nTiCmIcOQqsNHvLxsZClN XCtcyX0VLsB0o0AbUALIl7SFMTfHJph1b/xAubX2HpfXKvou+QWLCoaS0+ODRyQCNnw6 PCqaCOfk8QjlVUbYE3FpWUp1EQbhHVRC2KPUwSTyFHYnzyYNBAt0iRM8EETjM4WciGcr f880nGPhloo1gVdEHkE9c1BUI4LbeIzEMU4w7tRsOQbcpgrhASJWsSpnCpecVXhrAYXn zUww== 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=MKI2DrGuRCF3uqhESaJbi/tvyPvWigwWMjSd/2JbHyUNyyXuLm8bfOOeuTkxsn9/t1 ED2R/OJk+eM+f1kVo8C3uNt3gWV2fQbtHshrY3HBjBRoGVye0IpHf+MrrUDI1TSyBKAK 1cIQnyIm1vqyxyfPETruy3QsdKhEUHDl3gOiEt2SFREXq9VjSMRVBB5AlhquxcBumwac 7b06ee/ofvyp08wLAp97kJAC5lJ9FDtfrSrklEJTLgL1inzSxhgGazQM2DhLnfnP8qK7 tCHQZsyapLmHxpmmCulgDbJFSmCYXEQ+PJlpAYBnzi9vunLF6whScNFFDZKsq86JT6vO PI+g== X-Gm-Message-State: ANoB5pmpnerctemoChknBUKdYrdshWEZzto8w9zVWXO4KqXg7jIZBudw fX00mECAmqxua04Jcpmf7Cw/iieWjWg= X-Received: by 2002:aa7:dbd9:0:b0:461:e8c4:d21f with SMTP id v25-20020aa7dbd9000000b00461e8c4d21fmr8386319edt.186.1669474026425; Sat, 26 Nov 2022 06:47:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:29 +0100 Message-Id: <20221126144648.73162-13-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 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: 5rxNCjTX+97z --- 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)