diff mbox

[FFmpeg-devel,v5,1/2] avfilter/f_metadata: avoid trailing whitespace in filter output

Message ID 1506519011-14507-1-git-send-email-t.rapp@noa-archive.com
State Accepted
Commit f102a4efcef33014d414f9bf4492a04feab20c82
Headers show

Commit Message

Tobias Rapp Sept. 27, 2017, 1:30 p.m. UTC 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
---
 libavfilter/f_metadata.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Paul B Mahol Sept. 27, 2017, 1:50 p.m. UTC | #1 
On 9/27/17, Tobias Rapp <t.rapp@noa-archive.com> wrote:
> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> ---
>  libavfilter/f_metadata.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>

lgtm
Tobias Rapp Sept. 27, 2017, 2:18 p.m. UTC | #2 
On 27.09.2017 15:50, Paul B Mahol wrote:
> On 9/27/17, Tobias Rapp <t.rapp@noa-archive.com> wrote:
>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>> ---
>>   libavfilter/f_metadata.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
> 
> lgtm

Pushed both patches.

Thanks,
Tobias
diff mbox

Patch

diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c
index 23bc254..523a94d 100644
--- a/libavfilter/f_metadata.c
+++ b/libavfilter/f_metadata.c
@@ -314,14 +314,14 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
         break;
     case METADATA_PRINT:
         if (!s->key && e) {
-            s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n",
+            s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n",
                      inlink->frame_count_out, 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:%-4"PRId64" pts:%-7s pts_time:%-7s\n",
+            s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n",
                      inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));
             s->print(ctx, "%s=%s\n", s->key, e->value);
         }