From patchwork Fri Nov 25 01:30:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949169pzb; Thu, 24 Nov 2022 17:33:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5AZNpn21OCmSCuTVS21bm39fojXYc2fc5PUtLaKwGCY6X+zYKCEiv1xBxYLhM5EetCrmk1 X-Received: by 2002:a17:906:15ca:b0:7a5:7c1c:cc5c with SMTP id l10-20020a17090615ca00b007a57c1ccc5cmr29799253ejd.644.1669339986804; Thu, 24 Nov 2022 17:33:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339986; cv=none; d=google.com; s=arc-20160816; b=pXbA+xtDOMKE5g+nAfahiVI9bC6RReFGZjPzUXxch0kmknAWjBoDVqZIBJQNF0JCrF z1zeLvRffotKK/OLEBwz7M4j7875mGtTNZCBmp31H4ojXuy20Rx5hugr1QMtPnQv95h0 kbjlDpcPVKrURZjPFpjjluj9edZOcb9pLkVJFSZlE0cHFJQMNSApKw7hPFr3ZzjGVoKH VqSlzv0QZ4WI4YrHg3VawdXvK9eEWM626H9qPCzenvnzwQbcxy7RWYjLVi/G7UdKtpaz Cioh8FQhuW6GW/VrawOJBQsGzjVmWm03jilwIvH9q3lZP5fpNYbZ8undwUcm3RFtD33A hMww== 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=4h8XefT9Tcp/17Lb+sAmCHOnm2jXiIxk4JPFNY+2jp8=; b=XMCbLioio9tR1R437HvU42RMU+Jkcf7SB4UEN5Sqel5+5CufGUWGUI8AWSugXrJmyi 5KwS6CAQFK24fjKh/mSngAAV9MzA7wIX89sA821DpwdHO7hPZKHKNJjknIg0IIqsmevq h9SxBTXBwu8E0bM368aZjURPFZAyJdRG/4hSqK9OzAGcJH0UQorwFyxCJumnVmWOOYAH wVuDRyBnBovr9rq96DZwdkGu7iqtMp69zIquz11JiVFRxfAsVlPETp4eHkpWiuBZIxg6 /WqauH1BXq3OYUNucmJ0IA9BhmwSwn5uAmUGOaQB5hMqkTfXBCI2q8TXmVAZG9uRgMUZ Nmmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=X4ivk0T0; 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 x8-20020a05640226c800b00453b9f11bb1si1199421edd.206.2022.11.24.17.33.06; Thu, 24 Nov 2022 17:33:06 -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=X4ivk0T0; 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 B137368BBE0; Fri, 25 Nov 2022 03:31:14 +0200 (EET) 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 3B11C68BB03 for ; Fri, 25 Nov 2022 03:31:02 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id f7so4498118edc.6 for ; Thu, 24 Nov 2022 17:31:02 -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=vaEtfww3TrHuT7bQLZ6OqR4o/z+mfSKSTBJiTweB6lM=; b=X4ivk0T0vV+qIgoERST8j4I8+vQODZ7p5T8e8hBS9pOyUR9Nmm1hReV/fqpvCSlDTd qO7TArWksKDMryVO2zKO9kPOEy1iWuwqTYYl8c55/1vGLEdkqgYNjfmdmLhoqG20/Zzw dIWBr0qjMYsa0nZBlZtNxUEPIXTItBabhNj9yH8zHNMXYwokFdAErCjzKv/Ut8TXTRpi tkI2oDIKwCr2Ffm8AtAJn8vdG6lcIf0KP6iotowHUYwWMaITnQOkcHIHm70xfTB9cIGV rKXRRGHTL3xnFC51KIVikYWmdbVev2pAsDZRWuwU5DP8X1RyoN93JQXEEqIcKUoyc8GJ nIaA== 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=vaEtfww3TrHuT7bQLZ6OqR4o/z+mfSKSTBJiTweB6lM=; b=pxCdB/JiRnZ4imJJObCck+x3uadtwQ4qDtJfqKgFdiy0OjgL8FRn+ggkzKScMw4c4v 7WYgB1Fj6OzSsD8NayEEiLFEx9krz1svY9x6/kW8WbTlO6vPuJVuJWxGCorz15KNvpSi zeoxazOy3flX4mqjhVjAoR9OPQz0Nhr3GuvqMjfNeqKAQbS3zF813h4KdPW2vWRN2e9a 8oNBPGnSgI5gE3OE1ewZSicWNgos9cbCGOxXr7D4AvFYloq7Y4pcYoRR52EWqjyGjTpf 9B1LU37sNo511SqBYqjD7AuzKcvHOEOCMBUfJZei5Xy/qvroEe4XPsTp3KNGdyThpBsw m1KA== X-Gm-Message-State: ANoB5plYQaNQlqQFieSYjE2SKNSkmbJxNkXcJzHUhCHLW4+4SBUUBQwi 3PbfjCOEqCZtZRR8RcCubzJST/6UvNY= X-Received: by 2002:aa7:d7d3:0:b0:469:906:2ece with SMTP id e19-20020aa7d7d3000000b0046909062ecemr18556012eds.342.1669339862352; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:02 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:29 +0100 Message-Id: <20221125013046.40904-15-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 14/31] avfilter/f_metadata: 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: g69szPXvdos1 --- libavfilter/f_metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 82491f2bb8..4b7cfb0cb7 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -308,7 +308,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterLink *outlink = ctx->outputs[0]; MetadataContext *s = ctx->priv; AVDictionary **metadata = &frame->metadata; - AVDictionaryEntry *e; + const AVDictionaryEntry *e; e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, !s->key ? AV_DICT_IGNORE_SUFFIX: 0); @@ -339,7 +339,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n", inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); s->print(ctx, "%s=%s\n", e->key, e->value); - while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { + while ((e = av_dict_iterate(*metadata, e)) != NULL) { s->print(ctx, "%s=%s\n", e->key, e->value); } } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) {