From patchwork Fri Nov 25 01:30:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949038pzb; Thu, 24 Nov 2022 17:32:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JUzVexXRaFm2sdtwZ/n8kUxOO+VqoB1h+opOntqFmJ01MwW+ZKcYsJo6E0K6UiWfRn8jo X-Received: by 2002:a17:907:c007:b0:78d:b371:16d4 with SMTP id ss7-20020a170907c00700b0078db37116d4mr13294897ejc.434.1669339970916; Thu, 24 Nov 2022 17:32:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339970; cv=none; d=google.com; s=arc-20160816; b=vc8CLDBGpfJJjtXXBx3lHtHzTyz520zwlFTO4XMH6CXqq4CdOge+wKDfQvYaITC043 Aa9wwOAR0byFhu+sJ+a25JJpAEc8iG5eVGw62t10yG9CJ2fBr9SArO0YeLTMVn5cmgbq CpTmSPCjjN460k3qgranCp99x3eTDLDVSXcq3uBbw9zAqGp4aRdk5urgXi+0EAL0dtGu Ba1TwypamrfrrVxAXC6HvCu8ZyMArODX4SAtcO8hLiP+T5JTXqeLZXfISWJv9dGFIDTB LvuaXL1xybhKIenF3rEJXUzjUlSgxMCWBRvi0Q5oYSsSJ+2q8uy5b5ITFHwuTUINSE8X 0PQg== 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=wvlcb2YY2swnzURHPzLRycR5+g4DVTkO/bxbPkaB5hk=; b=uionsjIk8kHRklr3Fki+Dlu3SKyNhplfC9ZId1uzlFHYFftnmARpNK6raf67OI00TW /cBSL9wW6keohyBAisEBCnA4kW/Fin107rAONYmeT8UmaAYvbk+v0wzLPHVFyzdzDMD7 UcPIWVVCYJg/dOQXVFUSols7DPkIwhlKYhj9Opby+N9AlHqe2U4GQnW8N/uhZEFkEsY1 HXgtHGcMcZ0wjOTIKDrYv6z5RxJBD5khBPESDd71OJ+qK2ocXJnvsd/49QpiDKgXmA6S TuFrb5r4y6kYKFyDXsZKl1n0HJ2KGUpssziGv3gNfIAVkRmFXMDW0U03TOaYUik2n1pA zdyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RBVFOCX5; 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 jr12-20020a170906a98c00b007919fc02ce8si1500966ejb.971.2022.11.24.17.32.50; Thu, 24 Nov 2022 17:32:50 -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=RBVFOCX5; 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 7DE0068BB03; Fri, 25 Nov 2022 03:31:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95B6768BB61 for ; Fri, 25 Nov 2022 03:30:57 +0200 (EET) Received: by mail-ed1-f47.google.com with SMTP id m19so3260051edj.8 for ; Thu, 24 Nov 2022 17:30:57 -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=9Ut4aUzD+AIzd7FygX3waH6PQbnpTYBeNhaMOP0xtws=; b=RBVFOCX5cKvN4DAlYSDch9MBxPIkt5QBUrtzt9ljCWOQkGe3vXCKvIJaZ+hEfioabj gKpXoKMk/7IoS0aIlFKrQ9qzHCJV7DYGk7EdZ3dUrTbrXmA4nO+LFpCf/q12RUWxPiHo wkH8HYhoQVljbehQMS+ywgt53yYMQFnSO+W6E8KhVIWJYpuIp8Hmo35DRyLO4d5ABoNb ph6wldLE3ghEX7U8YdZq0mFEJ9kUSwrRwI8fn+EB9kc5Ixe6iuOE/SkH2th22cq3qkc7 P1ZF1dELdI3cMhpuUtVoOkGO0K8mn5aIl9an5rCuDJOLkC1LLs/7g4ELIzJTfqjWV6/v 3dbA== 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=9Ut4aUzD+AIzd7FygX3waH6PQbnpTYBeNhaMOP0xtws=; b=QCf6rFjopRYBrdLqBd1+ZkT8uwlXJdGJ9GMNKPEO1M0eTfifikO9V7pNND6mSSS85B fwTTODP2AG6WrdlsqjS+SynEWhJL69Pww7S+SCUBs5hOAkxFrL5JVZTKtgV9OyruVuL9 AbWSKQOrHv/+G27i6xNxPKc4Rf8KgOmApjSVI/3dtvYR8HcVlxjT/pGL0xzndJzLxTuS 1QF/KpcJ6OZ5w0jQgOgMAooJqt4lS8i/boQOpkOisiUeEKU25YnKWvtdse2pDzDbeHwX Uygu2UavBjKLXQ1bqz7jiDhA2CdXaiqsivOnTWWmBBTZXhPBczxrO7A8qvFBpTzSNUur m8PA== X-Gm-Message-State: ANoB5pkeHahhqhHwQlHcHP8go9DdQ49d3gk3usYwiDKUsua7S/fV2PYR 6Z6vDlxhqY5G0lEinvYuU+jthkLMOE4= X-Received: by 2002:a05:6402:b73:b0:46a:890d:b0a8 with SMTP id cb19-20020a0564020b7300b0046a890db0a8mr4666561edb.363.1669339857073; Thu, 24 Nov 2022 17:30:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:56 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:22 +0100 Message-Id: <20221125013046.40904-8-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 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: jEdWARxtnViy --- libavutil/opt.c | 12 ++++++------ libavutil/tests/dict.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 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..8c05752ea7 100644 --- a/libavutil/tests/dict.c +++ b/libavutil/tests/dict.c @@ -22,8 +22,8 @@ static void print_dict(const AVDictionary *m) { - AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) + const AVDictionaryEntry *t = NULL; + while ((t = av_dict_iterate(m, t))) printf("%s %s ", t->key, t->value); printf("\n"); } @@ -94,7 +94,7 @@ int main(void) if (av_dict_get(dict, NULL, NULL, 0)) printf("av_dict_get() does not correctly handle NULL key.\n"); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("%s %s\n", e->key, e->value); av_dict_free(&dict); @@ -106,7 +106,7 @@ int main(void) printf("av_dict_set does not correctly handle NULL key\n"); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("'%s' '%s'\n", e->key, e->value); av_dict_free(&dict); @@ -122,7 +122,7 @@ int main(void) av_dict_set_int(&dict, "12", 1, 0); av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("%s %s\n", e->key, e->value); av_dict_free(&dict);