Merge commit '52269f48e835a52023656f8330262ae70e6061c4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:39:22 +0000 (16:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:39:28 +0000 (16:39 +0200)
commitc87f645a757e1888932a57a2b5ef8ca44098a9e0
tree01d1b71ca3256b049a7cee0f0ae91f651a226988
parent79d0e164cfef96d77cca5b056fcf097a4c63a28e
parent52269f48e835a52023656f8330262ae70e6061c4
Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/version.h
libavfilter/vf_interlace.c