From patchwork Sat Sep 24 14:36:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1156639pzh; Sat, 24 Sep 2022 07:37:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7J90PePpVOIPgNJLu+2BoP4NJ6FhQH94m6ZhSKRgdYCAjQMBv3APM0PEluMUxtSZHkF9Dv X-Received: by 2002:a17:907:2c4b:b0:77e:2c09:4111 with SMTP id hf11-20020a1709072c4b00b0077e2c094111mr11772328ejc.21.1664030252228; Sat, 24 Sep 2022 07:37:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664030252; cv=none; d=google.com; s=arc-20160816; b=IsbyRuNMUvxrykks+5QJSme6yYlE2vs//ctdLTr+9llQR9M8/0WLCG8EiyU1CNRgaI GQr9mno5l9poNDzEDGIJz//bMLbmoZMTENOmpbxx9pOUz+PLW9y1UAVONnDaMskqQOw7 kvpbTKJt+XbZB+Y3EeTEYuuzf/5hJTb/jM4926PW95sSxUXzcjE/WEPWRSm2HpMHvE3N fht0J3//3wSjiZllHQlDDx+GwEd/mqbR0+2SZ+lLYpCSMh2xajU8MX+vHB//vyhMV5jl IeHw/wQjqlLeXfb4vMrZFdv6kM4utQzEHv6DlrpzXHqpzhF0O7luqKKPRVyEvkBmHCLP DuUw== 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=UQkQUYN/3TWm3uuSxcFhKpnjfiNTjXca2iOG6itClWg=; b=X75PRDOG/rcFnwUSjgT628LCVJiwmhcAHoR8wIcBE676uzvE9OdpTVWOu8e0HuPv3T 5tmVd68CvLNK2dU3YQiFS8F0pUv2LLppemt4EsXU/EnyOPGQpJ8mmDICdjIeTVTMp/9j GAejJFW41yPF6Ogf2dPc6Vmug0MlmtJM62vnbpwgxZciqjz+NEvyP/xLO7m4E/V5wYq6 x2pyqVXK0i3q6fM7W4Jsn4HUSe514O0QsNv/OdUjbkpw0wCGqrNBrtIA+1AuJddfenqk ZdeY2+8kOYBXMRDsm0rQhn8y7idV/ag/CufR2GtoIX/HJsy025arZZmrI6aBg+WTPzKj U2OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IVwEwus4; 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 z16-20020a05640235d000b0044e78dbb615si12159779edc.379.2022.09.24.07.37.31; Sat, 24 Sep 2022 07:37:32 -0700 (PDT) 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=IVwEwus4; 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 47BB068B973; Sat, 24 Sep 2022 17:37:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CB7468B6AC for ; Sat, 24 Sep 2022 17:37:14 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id 13so5994405ejn.3 for ; Sat, 24 Sep 2022 07:37:14 -0700 (PDT) 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; bh=OqhVdOIJGE0bLt7Zvcq0qVDWcpr9akZSMX5yMWcmLeY=; b=IVwEwus4urZS/7iUnFpcm/aJQr5R1qbZVRwiCeeyaoDF7KCdj+sVKUw/PDrlbEOeFo RnjYTBcZKf1W/4SLqJlPnHKQNiC1CIec0JnCaeQXM5kX2XhNevJPt8eu0yOxtmFr+IhD u2f6td/8re2vJVwt1tbZ4Q8JWFVR/R21ox4CXJs+x9Nb8b9MUAcPOznmIEDAeaxY53qj Q8+UJY6mZ0NuI3an59bpz1AZLXq8Lurj1181TkHzNZwV49zcQRDa7JCg0LiYRsYLXaF+ TEYM+h47ed+WpJ9UDknzU+3hOm3/UA2snuN9PEE7/1j0SE7wLXt9BHjBKi/UV4JjI1bp ugSg== 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; bh=OqhVdOIJGE0bLt7Zvcq0qVDWcpr9akZSMX5yMWcmLeY=; b=7ehPcsx9DKOjNPX8V/LT5UJykFaV6Hi/8/omA8DSPbHXexW6hHxQq1BUDL1LNQYfkY Yb0kHcV/wttLjkkGNePy4xvJv5ORBxyY9l4bSKz5jgw+eHhyP4/jF2N32d3lfpTWN1qO hNRAV14xZqJX5EtsGWq7dWxkQgbML0u+Odt1nU2x5jMb6ka1xncklzxrPYJc8NajwxLA Zs8rTnEljVx4JT7Itd5/mj3/Y15fWwVrhHDeNb5egg6fxwnrGV2WuXC46YPkF/rS1vLR 3IILIpxY4adlSsWlyoKnzaiwVyrlVZbVobdVmwur9T8uYyZkBjOQTH5wkMX4IvCDjR0o ovWA== X-Gm-Message-State: ACrzQf1yFWmh19hxclhHMeIS5MsVj/q/l7QyPlD4CErcJz7loGfuk8Rx GZFKrf/fWqeLQvNbo3b3NKtNtMPjC0vsDA== X-Received: by 2002:a17:907:3f28:b0:781:e093:d0db with SMTP id hq40-20020a1709073f2800b00781e093d0dbmr11212126ejc.295.1664030233676; Sat, 24 Sep 2022 07:37:13 -0700 (PDT) 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 u17-20020a50c2d1000000b0044e8d0682b2sm7970504edf.71.2022.09.24.07.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 07:37:13 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Sep 2022 16:36:56 +0200 Message-Id: <20220924143659.74756-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20220924143659.74756-1-epirat07@gmail.com> References: <20220922020216.46589-1-epirat07@gmail.com> <20220924143659.74756-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] avutil/dict: Use av_dict_iterate in av_dict_get 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: 5+nGFoOMRK0q --- libavutil/dict.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index ee059d712c..ea03590d0f 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -60,18 +60,14 @@ const AVDictionaryEntry *av_dict_iterate(const AVDictionary *m, AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags) { - unsigned int i, j; + const AVDictionaryEntry *entry = prev; + unsigned int j; - if (!m || !key) + if (!key) return NULL; - if (prev) - i = prev - m->elems + 1; - else - i = 0; - - for (; i < m->count; i++) { - const char *s = m->elems[i].key; + while ((entry = av_dict_iterate(m, entry))) { + const char *s = entry->key; if (flags & AV_DICT_MATCH_CASE) for (j = 0; s[j] == key[j] && key[j]; j++) ; @@ -82,7 +78,7 @@ AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, continue; if (s[j] && !(flags & AV_DICT_IGNORE_SUFFIX)) continue; - return &m->elems[i]; + return (AVDictionaryEntry *)entry; } return NULL; }