Merge commit '696141e898193311c994b399a8dc60713709092f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:38:11 +0000 (22:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:46:10 +0000 (22:46 +0100)
commitf931b1ef450e67c211c6294788da3a1265c0af81
tree596731cb8f9c0d46894d547de5ed5f023026e4ab
parent30cf755548a9c73753db6c405bda935016a86f49
parent696141e898193311c994b399a8dc60713709092f
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@gmx.at>
libavfilter/vf_interlace.c