[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Stefano Sabatini]

On date Saturday 2012-07-21 22:32:10 +0200, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 21 22:19:19 2012 +0200| [9e1508f1e7a21aab9c25614c03d726e400c5691c] | committer: Michael Niedermayer
> 
> 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 at gmx.at>

This or one of the previous commits is causing a crash in the command:
ffmpeg -f lavfi -i "testsrc,split[right],pad=2*iw[left]; [left][right]overlay=W/2" -f null -

The problem seems located in the overlay (double free on out_buf).