[FFmpeg-cvslog] vf_settb: simplify start_frame().
Anton Khirnov
git at videolan.org
Sat Jul 21 22:32:08 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jul 11 11:00:48 2012 +0200| [0393af4f0b9a536fb2a005c94aeb3a476db2645b] | committer: Anton Khirnov
vf_settb: simplify start_frame().
Avoid pointless filter ref/unref. Just use the reference passed to
start_frame().
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0393af4f0b9a536fb2a005c94aeb3a476db2645b
---
libavfilter/vf_settb.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index 62084bf..ccd41cc 100644
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -108,18 +108,17 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
- AVFilterBufferRef *picref2 = picref;
if (av_cmp_q(inlink->time_base, outlink->time_base)) {
- picref2 = avfilter_ref_buffer(picref, ~0);
- picref2->pts = av_rescale_q(picref->pts, inlink->time_base, outlink->time_base);
+ int64_t orig_pts = picref->pts;
+ picref->pts = av_rescale_q(picref->pts, inlink->time_base, outlink->time_base);
av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
- inlink ->time_base.num, inlink ->time_base.den, picref ->pts,
- outlink->time_base.num, outlink->time_base.den, picref2->pts);
- avfilter_unref_buffer(picref);
+ inlink ->time_base.num, inlink ->time_base.den, orig_pts,
+ outlink->time_base.num, outlink->time_base.den, picref->pts);
}
+ inlink->cur_buf = NULL;
- ff_start_frame(outlink, picref2);
+ ff_start_frame(outlink, picref);
}
AVFilter avfilter_vf_settb = {
More information about the ffmpeg-cvslog
mailing list