* commit '104a97be':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
	libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>