lavfi: unref AVFilterLink.cur_buf in ff_end_frame().

This reduces code duplication and prevents stale pointers from remaining
on the link.

diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index e09e3192bacf09ef300a9ade08cf2a8b71dbf9af..e1faf748559f6077b6ba3f86ac6426b0207691ee 100644 (file)
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -91,6 +91,7 @@ static int add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf)
 static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
 {
     add_to_queue(inlink, buf);
+    inlink->cur_buf = NULL;
 }
 
 static void queue_pop(FifoContext *s)

diff --git a/libavfilter/split.c b/libavfilter/split.c
index a3f6ef23373c1dc39412764c434e4cfb78097a9d..33cb226b939e19af0e3f144ce2f5f38a58a398eb 100644 (file)
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -89,8 +89,6 @@ static void end_frame(AVFilterLink *inlink)
 
     for (i = 0; i < ctx->nb_outputs; i++)
         ff_end_frame(ctx->outputs[i]);
-
-    avfilter_unref_buffer(inlink->cur_buf);
 }
 
 AVFilter avfilter_vf_split = {

diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 6d124c19d344e17a42b0b2f06f9bc1ca02143d1f..6988fcffa92db2cd092866fd9623f797577a7958 100644 (file)
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -317,7 +317,6 @@ static void end_frame(AVFilterLink *link)
     CropContext *crop = link->dst->priv;
 
     crop->var_values[VAR_N] += 1.0;
-    avfilter_unref_buffer(link->cur_buf);
     ff_end_frame(link->dst->outputs[0]);
 }
 

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 2f9e1f9cac284c729798ca2254cb79f1feff65bd..f9c5ad76bedfa186c0aa38ba79b10c5d9db90fab 100644 (file)
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -260,7 +260,6 @@ static void end_frame(AVFilterLink *inlink)
 
     ff_draw_slice(outlink, 0, inlink->h, 1);
     ff_end_frame(outlink);
-    avfilter_unref_buffer(inpicref);
     avfilter_unref_buffer(outpicref);
 }
 

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index fd2ec8deae44b58d2147312b36fddab43591d1e4..eac7245bfb13095f425b1f62048bfbb441b1f642 100644 (file)
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -868,7 +868,6 @@ static void end_frame(AVFilterLink *inlink)
 
     ff_draw_slice(outlink, 0, picref->video->h, 1);
     ff_end_frame(outlink);
-    avfilter_unref_buffer(inlink->cur_buf);
 }
 
 AVFilter avfilter_vf_drawtext = {

diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index b3cce19fcb3d0496c2d1817ca128c3f7519510e3..05882d13fec77f8e6ddfae45ebf07d0c139e20c1 100644 (file)
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -213,7 +213,6 @@ static void end_frame(AVFilterLink *inlink)
     }
 
     ff_end_frame(outlink);
-    avfilter_unref_buffer(inpicref);
     avfilter_unref_bufferp(&outlink->out_buf);
 }
 

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index bcc6a69814303710e85e8cd13eb63e4c66a7ed44..f78e008c7da0aa2f43cfd9f78071bb5f3c3c84a9 100644 (file)
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -175,6 +175,7 @@ static void end_frame(AVFilterLink *inlink)
     int64_t delta;
     int i;
 
+    inlink->cur_buf = NULL;
     s->frames_in++;
     /* discard frames until we get the first timestamp */
     if (s->pts == AV_NOPTS_VALUE) {

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 93ec92afa69af70ca03512f22ef85a3bf31a52c5..87c9276e3e4c97eb221941a01322a37f22febe45 100644 (file)
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -352,7 +352,6 @@ static void end_frame(AVFilterLink *inlink)
     frei0r->update(frei0r->instance, inpicref->pts * av_q2d(inlink->time_base) * 1000,
                    (const uint32_t *)inpicref->data[0],
                    (uint32_t *)outpicref->data[0]);
-    avfilter_unref_buffer(inpicref);
     ff_draw_slice(outlink, 0, outlink->h, 1);
     ff_end_frame(outlink);
     avfilter_unref_buffer(outpicref);

diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 735bd503a0b338c3271c9a0852f071cb45d5a2e2..b6583d70989932b09fb58abb84390a88e1091521 100644 (file)
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -225,7 +225,6 @@ static void end_frame(AVFilterLink *inlink)
 
     ff_draw_slice(outlink, 0, inlink->h, 1);
     ff_end_frame(outlink);
-    avfilter_unref_buffer(inpic);
     avfilter_unref_buffer(outpic);
 }
 

diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index af69d417c43aa9ea708fba0444aa517f6809645d..79adaea6637a535416a83d64af139ff0daa7cfb4 100644 (file)
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -322,7 +322,6 @@ static void end_frame(AVFilterLink *inlink)
 
     ff_draw_slice(outlink, 0, inpic->video->h, 1);
     ff_end_frame(outlink);
-    avfilter_unref_buffer(inpic);
     avfilter_unref_buffer(outpic);
 }
 

diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index ac892d948fd40d77d26d46946f1515df1b691031..f04d4690b5811cf89d2ac36c04a0dd7238573db0 100644 (file)
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -365,7 +365,6 @@ static void end_frame(AVFilterLink *inlink)
     ocv->end_frame_filter(ctx, &inimg, &outimg);
     fill_picref_from_iplimage(outpicref, &outimg, inlink->format);
 
-    avfilter_unref_buffer(inpicref);
     ff_draw_slice(outlink, 0, outlink->h, 1);
     ff_end_frame(outlink);
     avfilter_unref_buffer(outpicref);

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index b9d64b9495e02c548209da00fdc65cd95b02e46f..1230763e4ed6d564ac48ff00a4765569007b6e82 100644 (file)
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -339,7 +339,6 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
 static void end_frame(AVFilterLink *inlink)
 {
     ff_end_frame(inlink->dst->outputs[0]);
-    avfilter_unref_buffer(inlink->cur_buf);
 }
 
 static void null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { }

diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 037abd5d57ed56d068c5168da9216a165fbe5795..b0d5c5fb2fb52c38eecc6d3d1d23d3b28cdf5769 100644 (file)
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -348,7 +348,6 @@ static void end_frame(AVFilterLink *link)
 {
     ff_end_frame(link->dst->outputs[0]);
     avfilter_unref_buffer(link->dst->outputs[0]->out_buf);
-    avfilter_unref_buffer(link->cur_buf);
 }
 
 static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice)

diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 719885e4010856ee958e9046f5667b56d8cca90b..91d48f07da2f8c6512d7994511e13dbc53ee9d1e 100644 (file)
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -258,14 +258,12 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
 static void end_frame(AVFilterLink *inlink)
 {
     SelectContext *select = inlink->dst->priv;
-    AVFilterBufferRef *picref = inlink->cur_buf;
 
     if (select->select) {
         if (select->cache_frames)
             return;
         ff_end_frame(inlink->dst->outputs[0]);
     }
-    avfilter_unref_buffer(picref);
 }
 
 static int request_frame(AVFilterLink *outlink)

diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index f78244e6bd71b1ee38aecf5dd065b97e684f5490..e772e8b1193fdb22b63df8829caa42bbcf3b0d50 100644 (file)
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -192,7 +192,6 @@ static void end_frame(AVFilterLink *inlink)
         }
     }
 
-    avfilter_unref_buffer(inpic);
     ff_draw_slice(outlink, 0, outpic->video->h, 1);
     ff_end_frame(outlink);
     avfilter_unref_buffer(outpic);

diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index ddfbf2cd3cf2365a1f3942a7899cc612bd1b007f..3d28759ddfedc0d838174f248eb206ae27ee3a3b 100644 (file)
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -225,7 +225,6 @@ static void end_frame(AVFilterLink *link)
     apply_unsharp(out->data[1], out->linesize[1], in->data[1], in->linesize[1], cw,      ch,      &unsharp->chroma);
     apply_unsharp(out->data[2], out->linesize[2], in->data[2], in->linesize[2], cw,      ch,      &unsharp->chroma);
 
-    avfilter_unref_buffer(in);
     ff_draw_slice(link->dst->outputs[0], 0, link->h, 1);
     ff_end_frame(link->dst->outputs[0]);
     avfilter_unref_buffer(out);

diff --git a/libavfilter/video.c b/libavfilter/video.c
index feaaebab8680007619ae85ef2e09acda990c907b..e507f973b4bf84ee8bf932a16587a162df6cea00 100644 (file)
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -162,7 +162,8 @@ AVFilterBufferRef *ff_get_video_buffer(AVFilterLink *link, int perms, int w, int
 
 void ff_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
 {
-    ff_start_frame(link->dst->outputs[0], picref);
+    AVFilterBufferRef *buf_out = avfilter_ref_buffer(picref, ~0);
+    ff_start_frame(link->dst->outputs[0], buf_out);
 }
 
 static void default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
@@ -223,9 +224,6 @@ static void default_end_frame(AVFilterLink *inlink)
     if (inlink->dst->nb_outputs)
         outlink = inlink->dst->outputs[0];
 
-    avfilter_unref_buffer(inlink->cur_buf);
-    inlink->cur_buf = NULL;
-
     if (outlink) {
         if (outlink->out_buf) {
             avfilter_unref_buffer(outlink->out_buf);
@@ -250,6 +248,7 @@ void ff_end_frame(AVFilterLink *link)
         avfilter_unref_buffer(link->src_buf);
         link->src_buf = NULL;
     }
+    avfilter_unref_bufferp(&link->cur_buf);
 }
 
 void ff_null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)