aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_removelogo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-21 22:19:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-21 22:20:49 +0200
commit9e1508f1e7a21aab9c25614c03d726e400c5691c (patch)
tree1450ec6130c71c5d1867b43c5333b0afc2e62212 /libavfilter/vf_removelogo.c
parentf7e0c1854950b072dce4aa21053c1a344bf76c72 (diff)
parent4c9080a7ef18ad71fb0a75c8d1c1803edd780edd (diff)
downloadffmpeg-9e1508f1e7a21aab9c25614c03d726e400c5691c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavfi: unref AVFilterLink.out_buf in ff_end_frame(). lavfi: unref AVFilterLink.cur_buf in ff_end_frame(). vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer(). vf_slicify: clear AVFilterLink.cur_buf in start_frame(). vf_settb: simplify start_frame(). vf_fieldorder: don't give up its own reference to the output buffer. vf_pad: don't give up its own reference to the output buffer. vf_overlay: don't access a buffer reference that's been given away. vf_drawtext: don't give up its own reference to the input buffer. vf_gradfun: don't store two pointers to one AVFilterBufferRef. vf_delogo: don't store two pointers to one AVFilterBufferRef. vf_aspect: clear AVFilterLink.cur_buf in start_frame(). lavfi: add avfilter_unref_bufferp() Conflicts: doc/APIchanges libavfilter/avfilter.h libavfilter/buffer.c libavfilter/vf_aspect.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_pad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_removelogo.c')
-rw-r--r--libavfilter/vf_removelogo.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c
index 2e395c7eea..df67193fd3 100644
--- a/libavfilter/vf_removelogo.c
+++ b/libavfilter/vf_removelogo.c
@@ -516,9 +516,6 @@ static void end_frame(AVFilterLink *inlink)
ff_draw_slice(outlink, 0, inlink->h, 1);
ff_end_frame(outlink);
- avfilter_unref_buffer(inpicref);
- if (!direct)
- avfilter_unref_buffer(outpicref);
}
static void uninit(AVFilterContext *ctx)