[FFmpeg-cvslog] Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 16:38:10 2014 +0100| [cd259cdaa94717f7c6d2a0c87a7ba0171d1f0978] | committer: Michael Niedermayer

Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'

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

Conflicts:
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd259cdaa94717f7c6d2a0c87a7ba0171d1f0978
---