Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:52:27 +0000 (14:52 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:52:27 +0000 (14:52 +0100)
* commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f':
  testsrc: set output framerate

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

Trivial merge