-
Michael Niedermayer authored
* commit 'ca5c3ff9': vf_interlace: x86: improve asm performance Conflicts: libavfilter/x86/vf_interlace.asm See: 05e4b25eMerged-by: Michael Niedermayer <michaelni@gmx.at>
3fe3c8ab
* commit 'ca5c3ff9': vf_interlace: x86: improve asm performance Conflicts: libavfilter/x86/vf_interlace.asm See: 05e4b25eMerged-by: Michael Niedermayer <michaelni@gmx.at>