Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 15:16:41 +0000 (16:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 15:16:41 +0000 (16:16 +0100)
commitb14517d3cd3787f3c399f3ca7faf1a99a1066ff8
tree368cc144be79c3c7c4ef1a146c73b2ea19e53c64
parent130c33af35c5d8798f70c62586ab228d4f8cd2a2
parent35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_interlace: deprecate lowpass option

Conflicts:
libavfilter/version.h

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