avfilter/f_metadata: avoid trailing whitespace in filter output

Tobias Rapp committed 9 years ago

Commit f102a4e1 parent 0e563211 file · +2 −2Browse files

Unified · Split

libavfilter/f_metadata.c+2−2

@@ -314,14 +314,14 @@ static int filter_frame(AVFilterLink inlink, AVFrame frame) · 313 unmodified lines
314	break;	314	break;
315	case METADATA_PRINT:	315	case METADATA_PRINT:
316	if (!s->key && e) {	316	if (!s->key && e) {
317	s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n",	317	s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n",
318	inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));	318	inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));
319	s->print(ctx, "%s=%s\n", e->key, e->value);	319	s->print(ctx, "%s=%s\n", e->key, e->value);
320	while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) {	320	while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) {
321	s->print(ctx, "%s=%s\n", e->key, e->value);	321	s->print(ctx, "%s=%s\n", e->key, e->value);
322	}	322	}
323	} else if (e && e->value && (!s->value \|\| (e->value && s->compare(s, e->value, s->value)))) {	323	} else if (e && e->value && (!s->value \|\| (e->value && s->compare(s, e->value, s->value)))) {
324	s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n",	324	s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n",
325	inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));	325	inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base));
326	s->print(ctx, "%s=%s\n", s->key, e->value);	326	s->print(ctx, "%s=%s\n", s->key, e->value);
327	}	327	}