Merge commit '15ea222778caaec0877b3f9938140b707c931d96'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:50:45 +0000 (23:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:50:51 +0000 (23:50 +0100)
* commit '15ea222778caaec0877b3f9938140b707c931d96':
  vf_interlace: merge FIELD_LOWER check

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

Simple merge