diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-05-21 22:27:07 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-05-21 22:29:16 +0200 |
| commit | 39dc1bc90fa79ede19f5688a84d938f869924e51 (patch) | |
| tree | 2fa01e6a1dba1f1a8c6d8c23d4a7afc4fe9d3e6c /libavfilter/vf_showinfo.c | |
| parent | 81bec0ace4223305831450a194e2c2be01ff2975 (diff) | |
| download | ffmpeg-39dc1bc90fa79ede19f5688a84d938f869924e51.tar.gz | |
lavfi/(a)showinfo: use link frame counter instead of local counter.
Diffstat (limited to 'libavfilter/vf_showinfo.c')
| -rw-r--r-- | libavfilter/vf_showinfo.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 9acadcf2f0..336a870b17 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -31,14 +31,9 @@ #include "internal.h" #include "video.h" -typedef struct { - unsigned int frame; -} ShowInfoContext; - static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; - ShowInfoContext *showinfo = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); uint32_t plane_checksum[4] = {0}, checksum = 0; int i, plane, vsub = desc->log2_chroma_h; @@ -59,10 +54,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } av_log(ctx, AV_LOG_INFO, - "n:%d pts:%s pts_time:%s pos:%"PRId64" " + "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " "checksum:%08X plane_checksum:[%08X", - showinfo->frame, + inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), av_frame_get_pkt_pos(frame), desc->name, frame->sample_aspect_ratio.num, frame->sample_aspect_ratio.den, @@ -77,7 +72,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]); av_log(ctx, AV_LOG_INFO, "]\n"); - showinfo->frame++; return ff_filter_frame(inlink->dst->outputs[0], frame); } @@ -103,8 +97,6 @@ AVFilter avfilter_vf_showinfo = { .name = "showinfo", .description = NULL_IF_CONFIG_SMALL("Show textual information for each video frame."), - .priv_size = sizeof(ShowInfoContext), - .inputs = avfilter_vf_showinfo_inputs, .outputs = avfilter_vf_showinfo_outputs, |