-
Michael Niedermayer authored
* commit '696141e8': vf_interlace: use image width rather than linesize Conflicts: libavfilter/vf_interlace.c See: f043965cMerged-by: Michael Niedermayer <michaelni@gmx.at>
f931b1ef
* commit '696141e8': vf_interlace: use image width rather than linesize Conflicts: libavfilter/vf_interlace.c See: f043965cMerged-by: Michael Niedermayer <michaelni@gmx.at>