[FFmpeg-cvslog] Merge commit '696141e898193311c994b399a8dc60713709092f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  6 22:38:11 2015 +0100| [f931b1ef450e67c211c6294788da3a1265c0af81] | committer: Michael Niedermayer

Merge commit '696141e898193311c994b399a8dc60713709092f'

* commit '696141e898193311c994b399a8dc60713709092f':
  vf_interlace: use image width rather than linesize

Conflicts:
	libavfilter/vf_interlace.c

See: f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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