[FFmpeg-cvslog] Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:57:32 2015 +0100| [b2a8c8538d597d7b16998ff58ee57295a84dece9] | committer: Hendrik Leppkes

Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'

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

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

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