diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 22:19:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 22:20:49 +0200 |
| commit | 9e1508f1e7a21aab9c25614c03d726e400c5691c (patch) | |
| tree | 1450ec6130c71c5d1867b43c5333b0afc2e62212 /libavfilter/vf_delogo.c | |
| parent | f7e0c1854950b072dce4aa21053c1a344bf76c72 (diff) | |
| parent | 4c9080a7ef18ad71fb0a75c8d1c1803edd780edd (diff) | |
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_delogo.c')
| -rw-r--r-- | libavfilter/vf_delogo.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 996609da4a..35ceb35fd9 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -221,7 +221,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) outpicref->video->w = outlink->w; outpicref->video->h = outlink->h; } else - outpicref = inpicref; + outpicref = avfilter_ref_buffer(inpicref, ~0); outlink->out_buf = outpicref; ff_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0)); @@ -235,7 +235,7 @@ static void end_frame(AVFilterLink *inlink) AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterBufferRef *inpicref = inlink ->cur_buf; AVFilterBufferRef *outpicref = outlink->out_buf; - int direct = inpicref == outpicref; + int direct = inpicref->buf == outpicref->buf; int hsub0 = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; int vsub0 = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; int plane; @@ -255,9 +255,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); } AVFilter avfilter_vf_delogo = { |