ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Thu Oct 6 23:43:03 2016 +0200| [24022402be4cf3311c673b9a9096081e263b91e2] | committer: Marton Balint
lavfi/metadata: fix metadata deletion if comparison returns false Reviewed-by: Paul B Mahol <one...@gmail.com> Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24022402be4cf3311c673b9a9096081e263b91e2 --- libavfilter/f_metadata.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index f4a929c..f2c71d9 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -330,9 +330,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case METADATA_DELETE: if (!s->key) { av_dict_free(metadata); - } else if (e && e->value && s->value && s->compare(s, e->value, s->value)) { - av_dict_set(metadata, s->key, NULL, 0); - } else if (e && e->value) { + } else if (e && e->value && (!s->value || s->compare(s, e->value, s->value))) { av_dict_set(metadata, s->key, NULL, 0); } return ff_filter_frame(outlink, frame); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
