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_pad.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_pad.c')
| -rw-r--r-- | libavfilter/vf_pad.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index aeff4241d0..ba7020a0e9 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -263,6 +263,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { PadContext *pad = inlink->dst->priv; AVFilterBufferRef *outpicref = avfilter_ref_buffer(inpicref, ~0); + AVFilterBufferRef *for_next_filter; int plane; for (plane = 0; plane < 4 && outpicref->data[plane] && pad->draw.pixelstep[plane]; plane++) { @@ -299,7 +300,8 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) outpicref->video->w = pad->w; outpicref->video->h = pad->h; - ff_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(outpicref, ~0)); + for_next_filter = avfilter_ref_buffer(outpicref, ~0); + ff_start_frame(inlink->dst->outputs[0], for_next_filter); } static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice) |