From patchwork Sat Sep 24 14:36:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1156747pzh; Sat, 24 Sep 2022 07:37:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM691IWXg5T8RJ/tBEYvIMdOAqHNbymdMlDHbm3LWTQzjp3owOvBiDUHY/tBjmGbUJh1P9D2 X-Received: by 2002:a17:906:6a8d:b0:741:6a3b:536e with SMTP id p13-20020a1709066a8d00b007416a3b536emr11366745ejr.11.1664030269038; Sat, 24 Sep 2022 07:37:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664030269; cv=none; d=google.com; s=arc-20160816; b=NyJIv+Oiic7sQn+nYLiiSIiTOpAD/uJs9OfVwdHTiYK3OKhxmxbSEIfK+KKjH/fa2y S3qZMyvR5XlxHyviRF9k5oudqUgQh6RQsUZvUPusicSdNg821kBtm8XBZEQQRnXW4zHk MpqzxC5jQeBVrv7PQXwsTT/MmUwVOFDzXXeWypGXccy2t2t/d2glZYrkUNPCEdOo1F7w aQsP7lHLcu8hn5/3HrCNC6sVz1V2L48oUj9JS2LdWEXc330lcY2cg3P0VVSnQGmgoEst DzylVAEBamN+sB0u9EejpouJnTaoWV/LDgj8Vd037LJOGbUSAqUocx2JjEKsXmLw2fia vhqA== 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=ZjznEwAmZHySdVwBshnWTHlenqz4+JbDPEosxPttNHE=; b=ZV7H08FNAYiGARPkQDWOkoavMX15Ylv1him9pcjtfZ7ZixPNjb4gg/6pigAbsTUYr2 M4SGA73OD69opcCyhAuzdyXopbKJSdCOmjRGE9978OJfg3S2Jd1vIcAnTwmdsDGaXz+b LDHD71JagwmXuIbi39Vq/1aJxzag4vbrgiM8FFwEQQl7KxQQILQbYuT2fMSM1p6wdkc2 mh4HiiOwaEtUwXiSFBPN2X1e+DsYhPg5BiT9I0ABG7T/e8VsvclI9aLDSojS/IZ0flmE Qsf/Kz07YkCI2b0MGGaC918leJUDsMFRaw6y8/IJWxJQ6CbCQcpkdZdrs/XAbyjeRn/j G9dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PfwTGYrr; 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 dn4-20020a17090794c400b0073d5f9aa5e9si10688758ejc.327.2022.09.24.07.37.48; Sat, 24 Sep 2022 07:37:49 -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=PfwTGYrr; 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 9248168B9F1; Sat, 24 Sep 2022 17:37:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CCD368B9B7 for ; Sat, 24 Sep 2022 17:37:17 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id 30so3662463edw.5 for ; Sat, 24 Sep 2022 07:37:17 -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=DJoc8CIclbDzME7h+rdRdunwZwV+kXTv/1jrw7GkggU=; b=PfwTGYrriMK5k0QApcEtFTazQcQO2X+5XSDBP0G9dKqCTwqy5RO85Ut8G/mUIH64mk NVhciakUs95qgALw3rNdhb/fQ5AALfVncXVilK5a+1UoVOfC/fMS1Gp6jjYaYnKkpYcG ljw+KinFEfilQLsWtJNTwn6SXQcrEfh1CYbAl9uvOTnus69dg7uSJi+Ekiug+jFFPmO3 AUSz6jEoxkx3sE6uWlK9umnMEcgt5R4cM3x+59t/B5CR2stvJNMnxJ/8cyNNEt9/faLt oirTUGedr8JC7TpTyj96RjnIrYlQoYBIdj3jOvc95GQxEk1nn7bizdCB5DzHEjgak0HQ laew== 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=DJoc8CIclbDzME7h+rdRdunwZwV+kXTv/1jrw7GkggU=; b=iMy0/Ba+dV6KNNdlmuchinIoOLsktbuJb+jnedRIIQGXdqidUu4VMjraa6+Qi7zDOd WHlOdviueKM3aC8Wq3HHQUhdLI8W3Dvs/P8MtfepLwWXx6f/hi5hfXi3li95TrD0gqBO 64NJZnulNzGexPb2aGZb2Mv7ksuD8hskufBHIn+fa6qXG4QCR1suEcHEdbXVT3oCb/3R 2tQI2tBTDQZ4eLcNzhKwrryKzv85fLW6OJK/rA29KZdy+IboxXNYQpTBz0hMvpXmaaS+ WWKZW5ZD4JsHeRliXDZTZDhCkpgr3n4mIwQ3cAn/Sv5i1uM9WM/5jKtBW8Kj16GxRojR rMeg== X-Gm-Message-State: ACrzQf1Ehg26br+uXQwFoPPM1P2e+ZtoUhCJWyxAvh8r0WDO5Lc8JJzu KJ1KRp+DYc7Xk55cZFgcVmBs4MtrZxv+1A== X-Received: by 2002:a05:6402:1009:b0:456:f370:5263 with SMTP id c9-20020a056402100900b00456f3705263mr3334485edu.392.1664030237019; Sat, 24 Sep 2022 07:37:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 07:37:16 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Sep 2022 16:36:58 +0200 Message-Id: <20220924143659.74756-4-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 4/5] avutil/dict: Use av_dict_iterate in av_dict_get_string 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: C9JIj1UwSwuD --- libavutil/dict.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index 3c05ed4c84..122606e3aa 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -250,7 +250,7 @@ int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) int av_dict_get_string(const AVDictionary *m, char **buffer, const char key_val_sep, const char pairs_sep) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVBPrint bprint; int cnt = 0; char special_chars[] = {pairs_sep, key_val_sep, '\0'}; @@ -265,7 +265,7 @@ int av_dict_get_string(const AVDictionary *m, char **buffer, } av_bprint_init(&bprint, 64, AV_BPRINT_SIZE_UNLIMITED); - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(m, t))) { if (cnt++) av_bprint_append_data(&bprint, &pairs_sep, 1); av_bprint_escape(&bprint, t->key, special_chars, AV_ESCAPE_MODE_BACKSLASH, 0);