[FFmpeg-cvslog] Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 16:39:22 2014 +0200| [c87f645a757e1888932a57a2b5ef8ca44098a9e0] | committer: Michael Niedermayer

Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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