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)
commit3ce3973e5c2659e122465ec2e5a2debc8272c14d
treec177ee9f64c29a2481ffbb66457ff0aa498f406b
parentcb987128666a431f793e03ed5a50bd6c35685dda
parent5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f
Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'

* commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f':
  testsrc: set output framerate

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