[FFmpeg-cvslog] Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:49:30 2015 +0100| [4e8f1c6fb0022ef9ddfe95faa0cf7e301d165f61] | committer: Hendrik Leppkes

Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'

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

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

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