[FFmpeg-cvslog] Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:52:27 2015 +0100| [3ce3973e5c2659e122465ec2e5a2debc8272c14d] | committer: Hendrik Leppkes

Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'

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

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

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