diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-07-30 14:58:22 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-07-31 13:15:51 +0200 |
| commit | b4c3359828d232d8e81c1bff2dcbbca773dee2d7 (patch) | |
| tree | b39f6782f72b9a4d49bcb92f83228fb219576aed | |
| parent | a7c3720e879e61252c4f140aa2ebd35a34cd4dbe (diff) | |
| download | ffmpeg-b4c3359828d232d8e81c1bff2dcbbca773dee2d7.tar.gz | |
lavfi/asettb: do not create a new reference in filter_samples()
There is no need to duplicate the input reference, since a filter should
not pass along a reference which is later modified. If this happens the
filter passing the reference should be fixed.
Also improve consistency with start_frame() of settb, allowing a pending
factorization.
| -rw-r--r-- | libavfilter/f_settb.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index 033e1f7173..3430e70b6c 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -116,22 +116,20 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) return ff_start_frame(outlink, picref); } -static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) +static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; - AVFilterBufferRef *outsamples = insamples; if (av_cmp_q(inlink->time_base, outlink->time_base)) { - outsamples = avfilter_ref_buffer(insamples, ~0); - outsamples->pts = av_rescale_q(insamples->pts, inlink->time_base, outlink->time_base); + int64_t orig_pts = samplesref->pts; + samplesref->pts = av_rescale_q(samplesref->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, insamples ->pts, - outlink->time_base.num, outlink->time_base.den, outsamples->pts); - avfilter_unref_buffer(insamples); + inlink ->time_base.num, inlink ->time_base.den, orig_pts, + outlink->time_base.num, outlink->time_base.den, samplesref->pts); } - return ff_filter_samples(outlink, outsamples); + return ff_filter_samples(outlink, samplesref); } #if CONFIG_SETTB_FILTER |