From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1E55144E52 for ; Sat, 26 Nov 2022 14:48:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18E2B68BBDE; Sat, 26 Nov 2022 16:47:15 +0200 (EET) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A9D868BB03 for ; Sat, 26 Nov 2022 16:47:08 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id x102so9954596ede.0 for ; Sat, 26 Nov 2022 06:47:08 -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=dYmaU72Q/TKDwo6rQ2RMZpRVZY3y+G4TWnTxxD8nUK9TawApgWu1cmPe109UIV5bii DFu9FFWtgXXwSA8zO3u4+4vQDB4/RgMIGcE6CkXnkGfPruqKCV3p4s2k23FDTTXdcFPg WvZVQxvnpnpYqC6yhce5ZlaQKAZuwam19gcI5jg6xjnM6naz3r4j9Z1TrNe+C4tbAyc/ z98dFDMbfQ64ReqpUC2Gx5RcZrNRqQuqC3ABEJFKIIdbe1aSXUDNm52pQKLgDJhyC6wV 0ZPaBjaRwf+AXK1VIQDMe57cDitnpz/vu1UdkKvjX5ohh/Gvj3UaS6sZERxLAnx4sgZa GVhw== 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=ov6h10FpmGwu5ByTool5EhaP/rZxMBijXPPb32DJqAvFrjaG0WlCmJOrpxZJ7D2cI8 66bKoqLgHftYjLe8a3ecrUtFRky8VWdZ0P7/vTzFiONUQ/p5rRGcs0kDQhC90ECgIfsN SeT/gT0lKtgaMuQn7Khuuw85Bkd2HpHDaSbZoY4JnqweQ0IOhzRm0A3wIyWQVcZIxXfq zc7ZAbx8BmMNgTxXTtvZUNB/m1rKfJAeDYTH1ut84SwtTxdXrnqnskUmnRyUdS+oEHzf xwAWvDN66bMHGYTDWBlu+A7TCTavq8Ov0G+Soke1gn12qbE/m6vTurkiVyGkc7Nrb6Gg vbuA== X-Gm-Message-State: ANoB5pk0LxlKw93FkChs9ecFqauqnY04IuZkU71jArj1vp6Otoc/ApZ3 zlKr49YQRSP+/RLHCxsg6Lr1sSTDDCQ= X-Google-Smtp-Source: AA0mqf5L+v+vIlWfOLguvjRLBJuk/8bjqYadefIj4amldYP4x2iQNLl34mz92rJc+VGsRFfUcrUWQw== X-Received: by 2002:aa7:d5d6:0:b0:459:4e32:e1b5 with SMTP id d22-20020aa7d5d6000000b004594e32e1b5mr39695156eds.424.1669474027818; Sat, 26 Nov 2022 06:47:07 -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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:07 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:31 +0100 Message-Id: <20221126144648.73162-15-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221126144648.73162-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> <20221126144648.73162-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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)))) { -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".