diff options
| author | Marton Balint <cus@passwd.hu> | 2016-10-01 13:55:35 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-10-01 17:32:32 +0200 |
| commit | 7ef3e5b593fb984b318d971421a7e687ca69d536 (patch) | |
| tree | d3f670420efed463bf1c5384dd9660948c457ae0 | |
| parent | d946424f193391e37c034ceb2c72203309904e30 (diff) | |
lavfi/metadata: allow deleting all metadata
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | doc/filters.texi | 5 | ||||
| -rw-r--r-- | libavfilter/f_metadata.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 9d517575c9..4b2f7bf36b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16059,7 +16059,8 @@ Modify value of already present key. @item delete If @code{value} is set, delete only keys that have such value. -Otherwise, delete key. +Otherwise, delete key. If @code{key} is not set, delete all metadata values in +the frame. @item print Print key and its value if metadata was found. If @code{key} is not set print all @@ -16067,7 +16068,7 @@ metadata values available in frame. @end table @item key -Set key used with all modes. Must be set for all modes except @code{print}. +Set key used with all modes. Must be set for all modes except @code{print} and @code{delete}. @item value Set metadata value which will be used. This option is mandatory for diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 1fe713c34a..f4a929c1d5 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -194,7 +194,7 @@ static av_cold int init(AVFilterContext *ctx) MetadataContext *s = ctx->priv; int ret; - if (!s->key && s->mode != METADATA_PRINT) { + if (!s->key && s->mode != METADATA_PRINT && s->mode != METADATA_DELETE) { av_log(ctx, AV_LOG_WARNING, "Metadata key must be set\n"); return AVERROR(EINVAL); } @@ -328,7 +328,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(outlink, frame); break; case METADATA_DELETE: - if (e && e->value && s->value && s->compare(s, e->value, s->value)) { + 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) { av_dict_set(metadata, s->key, NULL, 0); |