From patchwork Sat Sep 24 14:36:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1156696pzh; Sat, 24 Sep 2022 07:37:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6KCK/Dlib1wkv+6XG8qJHyPv/BMv+L2vfIPfEnCT9tFWuAkLukdiPDKTmDGlJan6a9usTn X-Received: by 2002:a17:907:2d09:b0:781:d793:f51e with SMTP id gs9-20020a1709072d0900b00781d793f51emr11161604ejc.628.1664030260201; Sat, 24 Sep 2022 07:37:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664030260; cv=none; d=google.com; s=arc-20160816; b=fcHTSx5p1KudzkqtlRzyF28P42tCYgVfHQKp05Ri55Bh7pRX9B0RAETJvYxJ7btvHR PI/uUi7G5Be4GHZVxRAX7xXVTe+3bI7QKgIEZQttgByLNw2MF3IbGN6X+rMGoXa7zMer AdVHU8vZD3g8guDp/476LqY83uHFPFQpk6ryqJT0qZ/f/N7Duo5o5yGJu1yYxySYXOoK AKJdMMEVp3ISd7aNEtG/QWEymKlqbZaPRJeheI2cF1zq3uHOLF1eBJE6/QciDglCicC2 5MKXA8rcfwby8Z3xx+f32D5/ob1Nn39iiFgD1nOALh3kEfIYfq1efnYRpXSrlosY/Bwf GvJA== 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=2mWAaf8eekjOMBzJMPJkBATvzMXzRo4fAnqdlOFMEeQ=; b=wUc6iP9NHLBuKWR8XtxdClMDUPG1Ew+kzKwIqB4wcDaumAhOo6H89CMRgaaX0UyY1E /MRGUNVn30aZZnDf6VkFi3Tw25ALAoL7WxTi++nthc76RQwgPE23j4oROFewMmkHJOz3 5AusPCzOl0PCTJHtTceCbOHZ/5FltSP1U+B7260UWaNj5An9UgiNyJn3o1G+RRflAKCm InYRKDvDN2ptojoqzaJKMkKgYx8UOv5W03nskAqhchpdt8SCF0mck8QOq9/zSV37x8AF Kdoy/Me3LxR+IsbnSUM3vWKLwCg+U6MSH7GbwHZFKMZonWgIH6dZ1vGZnNARu5Fb9ki+ 6rbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pzyUbFjK; 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 g37-20020a056402322500b0044ef9c83492si11437318eda.472.2022.09.24.07.37.39; Sat, 24 Sep 2022 07:37:40 -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=pzyUbFjK; 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 7D48468B9B9; Sat, 24 Sep 2022 17:37:23 +0300 (EEST) 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 DC1F668B4CC for ; Sat, 24 Sep 2022 17:37:15 +0300 (EEST) Received: by mail-ed1-f52.google.com with SMTP id e18so3682239edj.3 for ; Sat, 24 Sep 2022 07:37:15 -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=xTQoRwkaxW50yNkv6DgExs7I+KGIR9+7ucdxtZrnTtI=; b=pzyUbFjKQID4K+/qXyJgM4LkTChAXTa5NF59LaoCTN5i9Mb+BfkpZPPEMBGKxtom7j fTFHHwoZag5xtdd2J+BgHO9f+CfjUcGzG5dbZn287p6jCGsIrrhmRbfYWHC4TNCHmwW3 pXPXQvZV16wnnQLh+jLF404X04lygMjVRZNLFWC3lczYdb/Ju6wtdswuqE/IlS46hwg0 0zzAgQxv8bY/mT1MQSlOEwroA6VhNy3bR97ppKFfQC1yd/qYV2Pl33NAadsNboKaKQ8r qPST64ZWgXSX9lk8zC855e3GlFWBEwyW/H7DxSn07sKxgfNZqFDgf9Az5PDgdQyt/ALy Tkhg== 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=xTQoRwkaxW50yNkv6DgExs7I+KGIR9+7ucdxtZrnTtI=; b=FQYdjM+Oc8T/2q4LWzjYhdpJgYWflQkg6FOOFdWwOMl1aO6lymErv18+w1xn5vIOhd EeTSaFvmECpjR/yjIrON3QCpiWOGMJjyhwo7SjPbTPKi0lDlNLJQqj7sAimpMKr92Vld Vb47/Y7dTTEMlKmc8xhhl/S1Ehzhr9K+LcEEdmVZ+vH0enpB9wStdIMrV/kljTTPJRtr 07S4gvB+O2LOHUB6eEb3WADGp0O0gPyqevKU+S+wgwCvisTYWzjy7vRob8rjNrZ1Zcdq dzjwrx/MKZ8gh4ACyTU0ryubqpyHeZzkehhi2aHkWW7cKy6+Jeb0waP1HIaoi/nYoH5K SkIA== X-Gm-Message-State: ACrzQf0PrfEN830uim/n2AAYuitYcojXJLduqx1rEBZF6KDjQOvP9u7W jzkXL50+4AQaRxAliZQ8GHgBLRoGj1YKJA== X-Received: by 2002:a05:6402:1e8d:b0:441:58db:b6a2 with SMTP id f13-20020a0564021e8d00b0044158dbb6a2mr13337952edf.277.1664030235324; Sat, 24 Sep 2022 07:37:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 07:37:14 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Sep 2022 16:36:57 +0200 Message-Id: <20220924143659.74756-3-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 3/5] avutil/dict: Use av_dict_iterate in av_dict_copy 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: GcrAGowpSmpA --- libavutil/dict.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index ea03590d0f..3c05ed4c84 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -236,9 +236,9 @@ void av_dict_free(AVDictionary **pm) int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(src, t))) { int ret = av_dict_set(dst, t->key, t->value, flags); if (ret < 0) return ret;