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)
* qatar/master:
  vf_interlace: better handling of odd video size

Conflicts:
libavfilter/vf_interlace.c

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