[FFmpeg-cvslog] Merge commit '1bf34134612e509fa68c70dfff418c6022459259'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 16:39:01 2016 +0000| [14f942b3598273e30556ca292b963b832b09015c] | committer: Derek Buitenhuis

Merge commit '1bf34134612e509fa68c70dfff418c6022459259'

This commit is a no-op.

* commit '1bf34134612e509fa68c70dfff418c6022459259':
  avconv: use the new buffersrc parameters API

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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