Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:57:32 +0000 (14:57 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:57:32 +0000 (14:57 +0100)
* commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa':
  vf_interlace: implement frame rate

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

Trivial merge