Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / f_settb.c

diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c
index 033e1f71739924852d3899b9f6db2a5f1c917b7b..e6c16aa2f9209bb667f83b75a5c1b9812983db63 100644 (file)
--- a/libavfilter/f_settb.c
+++ b/libavfilter/f_settb.c
@@ -23,8 +23,12 @@
  * Set timebase for the output link.
  */
 
+#include <inttypes.h>
+#include <stdio.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/rational.h"
 #include "avfilter.h"
@@ -116,22 +120,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