[FFmpeg-cvslog] Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:48:34 2015 +0100| [6375ba827a6d9587b5f62a1ed7482a6ed20718db] | committer: Hendrik Leppkes

Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'

* commit '61fb67dcb2e71a268c422fc19d366040e59fb337':
  buffersrc: accept the frame rate as argument.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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