[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 14:58:41 2013 +0200| [86d1a5d80f161f3295e3422123d08dc312652353] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86d1a5d80f161f3295e3422123d08dc312652353
---