From 39dc1bc90fa79ede19f5688a84d938f869924e51 Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Tue, 21 May 2013 22:27:07 +0200 Subject: lavfi/(a)showinfo: use link frame counter instead of local counter. --- libavfilter/af_ashowinfo.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'libavfilter/af_ashowinfo.c') diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 7770c276c9..75aed80a17 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -43,11 +43,6 @@ typedef struct AShowInfoContext { * Scratch space for individual plane checksums for planar audio */ uint32_t *plane_checksums; - - /** - * Frame counter - */ - uint64_t frame; } AShowInfoContext; static av_cold void uninit(AVFilterContext *ctx) @@ -86,10 +81,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) buf->channel_layout); av_log(ctx, AV_LOG_INFO, - "n:%"PRIu64" pts:%s pts_time:%s pos:%"PRId64" " + "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s channels:%d chlayout:%s rate:%d nb_samples:%d " "checksum:%08X ", - s->frame, + inlink->frame_count, av_ts2str(buf->pts), av_ts2timestr(buf->pts, &inlink->time_base), av_frame_get_pkt_pos(buf), av_get_sample_fmt_name(buf->format), av_frame_get_channels(buf), chlayout_str, @@ -101,7 +96,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) av_log(ctx, AV_LOG_INFO, "%08X ", s->plane_checksums[i]); av_log(ctx, AV_LOG_INFO, "]\n"); - s->frame++; return ff_filter_frame(inlink->dst->outputs[0], buf); } -- cgit v1.2.3