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)
commitb2a8c8538d597d7b16998ff58ee57295a84dece9
treec4ba19aebbdd91f2ead59f6e143281f134ec5e8d
parentef636aacf54ece8d596fa84f4d66beb2ab814080
parent65e73bc60f98dc7b26c687e145dfb755d3f2ccfa
Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'

* commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa':
  vf_interlace: implement frame rate

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