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)
commit82b1bcd7f9b650a9d46a22079c0cdac05badeebc
treebc9e919d6bf6c4f138490d960611ce10c0149f84
parent6279cb3597cc1c70638857a4940aa6a9da9a91c5
parent15ea222778caaec0877b3f9938140b707c931d96
Merge commit '15ea222778caaec0877b3f9938140b707c931d96'

* commit '15ea222778caaec0877b3f9938140b707c931d96':
  vf_interlace: merge FIELD_LOWER check

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