From 9486de5a85f0c54f241849d6b22bee943da557d0 Mon Sep 17 00:00:00 2001 From: Tobias Rapp Date: Mon, 9 May 2016 11:35:38 +0200 Subject: [PATCH] avfilter/f_metadata: update print output header line format Update print mode output header line format to be more consistent with other log output of FFmpeg. The printf-modifiers have been inspired by the showinfo filter. Signed-off-by: Tobias Rapp Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavfilter/f_metadata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index ee631c5ec1..ab07ccf482 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -306,15 +306,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) break; case METADATA_PRINT: if (!s->key && e) { - s->print(ctx, "frame %"PRId64" pts %"PRId64" pts_time %s\n", - inlink->frame_count, frame->pts, av_ts2timestr(frame->pts, &inlink->time_base)); + 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)); s->print(ctx, "%s=%s\n", e->key, e->value); while ((e = av_dict_get(metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { 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)))) { - s->print(ctx, "frame %"PRId64" pts %"PRId64" pts_time %s\n", - inlink->frame_count, frame->pts, av_ts2timestr(frame->pts, &inlink->time_base)); + 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)); s->print(ctx, "%s=%s\n", s->key, e->value); } return ff_filter_frame(outlink, frame);