Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'

[ffmpeg] / libavfilter / f_metadata.c

diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c
index ee631c5ec1e91701859e1f2fb76ea63f738f0489..ab07ccf4826b66407edce8631230a3a100d77df4 100644 (file)
--- 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);