Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:49:30 +0000 (14:49 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:49:30 +0000 (14:49 +0100)
* commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41':
  vf_fps: set frame_rate.

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

Trivial merge