From de1132a89113b131831d8edde75214372c983f32 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Tue, 22 Jun 2021 22:59:03 +0200 Subject: [PATCH] avfilter/f_metadata: do not return the frame early if there is no metadata The early return caused isses for the "add" mode (got fixed in c95dfe5cce98cde3e7fb14fbd04b3897f3927cec) and the "select" mode needs a similar fix. It is probably better to fully remove the check, since all modes work correctly with NULL metadata. Signed-off-by: Marton Balint (cherry picked from commit 758e2da28939c156b18c11c3993ea068da3ea869) --- libavfilter/f_metadata.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 598257b15b..3332d91a3e 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -304,9 +304,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVDictionary **metadata = &frame->metadata; AVDictionaryEntry *e; - if (!*metadata && s->mode != METADATA_ADD) - return ff_filter_frame(outlink, frame); - e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, !s->key ? AV_DICT_IGNORE_SUFFIX: 0);