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)
commit4e8f1c6fb0022ef9ddfe95faa0cf7e301d165f61
tree416ba3e466c541f11712af6d09dc959363ae00cb
parent6375ba827a6d9587b5f62a1ed7482a6ed20718db
parent1062880d69a4fdc8d8929dd5c22bb447182f1c41
Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'

* commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41':
  vf_fps: set frame_rate.

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