Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 09:13:37 +0000 (11:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 09:16:57 +0000 (11:16 +0200)
commitc4f3b55f507955a5db45802b09a1a38ff7f8bb8d
treef43676e6154d186c1118dfa64cca4902c4c2e2ef
parentf5b27b6d5f86626adf1ece529d8b48ddec7c2961
parent06e7301a2efa8dededecbe6836ee5b59bf7e5e76
Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
  vf_interlace: do not process an already interlaced frame

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