Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jul 2012 20:19:19 +0000 (22:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jul 2012 20:20:49 +0000 (22:20 +0200)
commit9e1508f1e7a21aab9c25614c03d726e400c5691c
tree1450ec6130c71c5d1867b43c5333b0afc2e62212
parentf7e0c1854950b072dce4aa21053c1a344bf76c72
parent4c9080a7ef18ad71fb0a75c8d1c1803edd780edd
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>
30 files changed:
libavfilter/avfilter.h
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackdetect.c
libavfilter/vf_blackframe.c
libavfilter/vf_colormatrix.c
libavfilter/vf_crop.c
libavfilter/vf_delogo.c
libavfilter/vf_deshake.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_mp.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_removelogo.c
libavfilter/vf_select.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_super2xsai.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c