highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/metadata: fix setting metadata values

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-10-01 14:15:27 +02:00
parent 4f8262e373
commit d946424f19
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/f_metadata.c
View File

@ -280,13 +280,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
MetadataContext *s = ctx->priv; MetadataContext *s = ctx->priv;
AVDictionary *metadata = av_frame_get_metadata(frame); AVDictionary **metadata = avpriv_frame_get_metadatap(frame);
AVDictionaryEntry *e; AVDictionaryEntry *e;
if (!metadata) if (!*metadata)
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
e = av_dict_get(metadata, !s->key ? "" : s->key, NULL, e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL,
!s->key ? AV_DICT_IGNORE_SUFFIX: 0); !s->key ? AV_DICT_IGNORE_SUFFIX: 0);
switch (s->mode) { switch (s->mode) {
@ -302,13 +302,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (e && e->value) { if (e && e->value) {
; ;
} else { } else {
av_dict_set(&metadata, s->key, s->value, 0); av_dict_set(metadata, s->key, s->value, 0);
} }
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
break; break;
case METADATA_MODIFY: case METADATA_MODIFY:
if (e && e->value) { if (e && e->value) {
av_dict_set(&metadata, s->key, s->value, 0); av_dict_set(metadata, s->key, s->value, 0);
} }
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
break; break;
@ -317,7 +317,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n", s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n",
inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));
s->print(ctx, "%s=%s\n", e->key, e->value); 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_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) {
s->print(ctx, "%s=%s\n", e->key, e->value); 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)))) { } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) {
@ -329,9 +329,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
break; break;
case METADATA_DELETE: case METADATA_DELETE:
if (e && e->value && s->value && s->compare(s, e->value, s->value)) { if (e && e->value && s->value && s->compare(s, e->value, s->value)) {
av_dict_set(&metadata, s->key, NULL, 0); av_dict_set(metadata, s->key, NULL, 0);
} else if (e && e->value) { } else if (e && e->value) {
av_dict_set(&metadata, s->key, NULL, 0); av_dict_set(metadata, s->key, NULL, 0);
} }
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
break; break;