Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:48:34 +0000 (14:48 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:48:34 +0000 (14:48 +0100)
commit6375ba827a6d9587b5f62a1ed7482a6ed20718db
tree416ba3e466c541f11712af6d09dc959363ae00cb
parent0b73d0ff0df7135332ef77e78b619b0822d248a8
parent61fb67dcb2e71a268c422fc19d366040e59fb337
Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'

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

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