Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:40:11 +0000 (23:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:40:16 +0000 (23:40 +0100)
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/vf_interlace.c

Simple merge