• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9e1508f1
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9e1508f1
Name
Last commit
Last update
compat Loading commit data...
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...