[FFmpeg-cvslog] Merge commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 15:02:32 2015 +0100| [1f185ed897ddcbe080ba68888197e34a27b817c9] | committer: Hendrik Leppkes

Merge commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d'

* commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d':
  vsrc_color: implement frame rate

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

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