From patchwork Sat Nov 26 14:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217832pzb; Sat, 26 Nov 2022 06:48:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf44Cn6dlC4vENjsnoAFZJsfQMczxj9Idor6LK4MrQjxlWDwmnpISgY2pyvuOtCd4rnuAiTL X-Received: by 2002:a17:906:32d9:b0:7ae:31a0:5727 with SMTP id k25-20020a17090632d900b007ae31a05727mr21017554ejk.540.1669474102974; Sat, 26 Nov 2022 06:48:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474102; cv=none; d=google.com; s=arc-20160816; b=vwi6yp9wXxCTdm4iRR1I7n/jt1MFkonRQF126MzjmRiYnhiYtOwQiq03vsVR9F7AhO f9BfwRKOstBrtA3Dmut01/ou6By3PKmdeE2Y+gVdNFlloGtiYNSg230kjggllSdHUfZc gkH8wbXImYDxtNNh9wuWX4LJrfBOXqrt/M7f/pzzoivrg4Og8WuDWyOaucQxYE22ibwP VxgnpqLZz3VKFaAhSTHF/Y9wzAoVDcK/bGeBbZvYMJ91vqR2oFdnjwTEipslqq1fbeRV /fC/EbKmjLHo71UdgpmGZr/XArdSxYbjEVBXR+//KpdWU8r1XxxjNFXVDo+7zx0Oorwo v5Mg== 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=hv7u9Jj+jTnAPXRnUY0V017r3nMJRrw0eE0Zl4h6PPo=; b=E+TeuE4RRBc/+tW2FISPcW/5rWkjm3qQcj/Z1eAOKGCyLF8ywKDc1hgt4iufXZM4Yz mDkAc9Pq/PyiKN6b3wA8Y5cmbWv4vt9xcuLobki1IT64zaEBIMoYlsJAPID6W2aHjbqV BaO+choMGtUHjteiI0pKhsZHoOnhMfjl8ydNbtNzwDxVb+YOT4AwuoHs2X43SuG3Y5LJ yuEHQVK36uGiV6p0Q2nXtR1iltXtE+oLWARdvogrU9IWaY7ZdnY7XEuIBDWeaF31bkM0 LiDLPSK5e71aK01hJR3X4tJfNEa3r9F8v4Vl6vsZRwtMYZWthkyd8QWmxNYOuVh/cdmO yvzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nxfV+TeJ; 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 nc10-20020a1709071c0a00b0078bcc872a6esi6424150ejc.360.2022.11.26.06.48.22; Sat, 26 Nov 2022 06:48:22 -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=nxfV+TeJ; 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 4B45168BACE; Sat, 26 Nov 2022 16:47:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 599FF68BACE for ; Sat, 26 Nov 2022 16:47:03 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id x102so9954409ede.0 for ; Sat, 26 Nov 2022 06:47:03 -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=AzRyvPvnN57I87YpWq3RBoS5JRYqPXqaGlDKZ6Uq2R0=; b=nxfV+TeJm63NaOVRga5/P6CZGU5dtHO7ktJ/FWj3glWwEheBSVPpZsa/gRYGMTsWzr V12TAejHeQip9UOFutxdZG8uQeJn1FhzHQyyGzGB1lLQ+6sBbDeTujcBwJ9Vr/FRA636 BtM68YI0Mr99PGbagyzYODT7l5XdIubqBORg9sSDVIpbRhITz0X03sVyWqZS01pvNR5+ jz6amdKMdm0k2+2teSeyFXxTirFL8rb9CbUpW2x73/BeG6fQ6/b7Y2PUgg+uWGmX/x/V fd3fT2kUPEQt++nUpfiNfsrEYr/TmFR5Zqotjli+qFAZCulTWq7lT5yM6d+FhQi90hR0 RfAA== 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=AzRyvPvnN57I87YpWq3RBoS5JRYqPXqaGlDKZ6Uq2R0=; b=ttygFgtl4tPOCeRtlX7obM53d4VZgXSlZBMy01kfGedMUBetU1HYln/Sb9u4+qudMt TGJ4XXZQ17ng3zgK48qZOPp3NNoTm/jxwbjdTZbprnKBpf1wgp1JYjgZv4B+BAd9gFTi aFyZ3Ga/p/bwopD9CPaVUH4OaaBBOAeVi8qZ+06LDYMkiA2GT8N3wz9spXJHwMJklA8K Tq2f5oqsaXv4m/4PhDIicI6ysx46+gEjAR6YZiGbKhrx9aGYV4RCj08mQY3rdpdj71aJ +zADMB00e+nqB0ifmYolCY3Z+pb4AaGpUIqCbXAvjHamBGgZ1008hvUUuxxR3DOICDHD pGdA== X-Gm-Message-State: ANoB5pkoUa8A2GknSAHXSoRufV6CvHDTfMLR6Sn2mTNqWJcC32R9FtRo +Vlw400ZfbX7G/yrqtqf+sISpoRSyZE= X-Received: by 2002:a05:6402:388e:b0:468:fb0d:2d8b with SMTP id fd14-20020a056402388e00b00468fb0d2d8bmr8743652edb.124.1669474022808; Sat, 26 Nov 2022 06:47:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:02 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:24 +0100 Message-Id: <20221126144648.73162-8-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 07/31] avutil: 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: b21GvpCiDtf7 --- libavutil/opt.c | 12 ++++++------ libavutil/tests/dict.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index a3940f47fb..0a909a8b22 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1742,14 +1742,14 @@ void av_opt_free(void *obj) int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVDictionary *tmp = NULL; int ret; if (!options) return 0; - while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(*options, t))) { ret = av_opt_set(obj, t->key, t->value, search_flags); if (ret == AVERROR_OPTION_NOT_FOUND) ret = av_dict_set(&tmp, t->key, t->value, 0); @@ -2137,16 +2137,16 @@ FF_ENABLE_DEPRECATION_WARNINGS case AV_OPT_TYPE_DICT: { AVDictionary *dict1 = NULL; AVDictionary *dict2 = *(AVDictionary **)dst; - AVDictionaryEntry *en1 = NULL; - AVDictionaryEntry *en2 = NULL; + const AVDictionaryEntry *en1 = NULL; + const AVDictionaryEntry *en2 = NULL; ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); if (ret < 0) { av_dict_free(&dict1); return ret; } do { - en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); - en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX); + en1 = av_dict_iterate(dict1, en1); + en2 = av_dict_iterate(dict2, en2); } while (en1 && en2 && !strcmp(en1->key, en2->key) && !strcmp(en1->value, en2->value)); av_dict_free(&dict1); return (!en1 && !en2); diff --git a/libavutil/tests/dict.c b/libavutil/tests/dict.c index d053545f4d..91567289c2 100644 --- a/libavutil/tests/dict.c +++ b/libavutil/tests/dict.c @@ -52,7 +52,7 @@ static void test_separators(const AVDictionary *m, const char pair, const char v int main(void) { AVDictionary *dict = NULL; - AVDictionaryEntry *e; + const AVDictionaryEntry *e; char *buffer = NULL; printf("Testing av_dict_get_string() and av_dict_parse_string()\n");