Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:59:23 +0000 (14:59 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:59:23 +0000 (14:59 +0100)
commit1b86a6bb2cea5038a546a35d8ea844cf5487081a
treebe04ea5e9e89ac7647eeef3d49ecd6a08a3330a1
parent1cb78a0dcfd05fb11a1237aa532868b4ce6eebb4
parent11f87ca71e9c7b917f594194f827fd040d1df5ca
Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'

* commit '11f87ca71e9c7b917f594194f827fd040d1df5ca':
  vf_frei0r: also set AVFilterLink.frame_rate

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