Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:58:41 +0000 (14:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:58:41 +0000 (14:58 +0200)
commit86d1a5d80f161f3295e3422123d08dc312652353
tree4e8e5fa7235f13a18ed6d0ecc67ef820e983c6a7
parentbc8240518830ba0d273bba6246392707ab55da2b
parentbec509db4364b9c8b00437939a4197fc12fec3e8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_interlace: better handling of odd video size

Conflicts:
libavfilter/vf_interlace.c

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