Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:50:33 +0000 (14:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:50:33 +0000 (14:50 +0100)
commitcb987128666a431f793e03ed5a50bd6c35685dda
treec177ee9f64c29a2481ffbb66457ff0aa498f406b
parent4e8f1c6fb0022ef9ddfe95faa0cf7e301d165f61
parent9df477e03ef74068f3de130adc4dd34349a16ef2
Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'

* commit '9df477e03ef74068f3de130adc4dd34349a16ef2':
  yadif: update frame rate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavfilter/vf_yadif.c