Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -308,7 +308,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 307 unmodified lines | |||
| 308 | AVFilterLink *outlink = ctx->outputs[0]; | 308 | AVFilterLink *outlink = ctx->outputs[0]; |
| 309 | MetadataContext *s = ctx->priv; | 309 | MetadataContext *s = ctx->priv; |
| 310 | AVDictionary **metadata = &frame->metadata; | 310 | AVDictionary **metadata = &frame->metadata; |
| 311 | AVDictionaryEntry *e; | 311 | const AVDictionaryEntry *e; |
| 312 | 312 | ||
| 313 | e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, | 313 | e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, |
| 314 | !s->key ? AV_DICT_IGNORE_SUFFIX: 0); | 314 | !s->key ? AV_DICT_IGNORE_SUFFIX: 0); |
| @@ -339,7 +339,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 24 unmodified lines | |||
| 339 | s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n", | 339 | s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n", |
| 340 | inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); | 340 | inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); |
| 341 | s->print(ctx, "%s=%s\n", e->key, e->value); | 341 | s->print(ctx, "%s=%s\n", e->key, e->value); |
| 342 | while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { | 342 | while ((e = av_dict_iterate(*metadata, e)) != NULL) { |
| 343 | s->print(ctx, "%s=%s\n", e->key, e->value); | 343 | s->print(ctx, "%s=%s\n", e->key, e->value); |
| 344 | } | 344 | } |
| 345 | } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) { | 345 | } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) { |