Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 01:28:23 +0000 (02:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 01:39:49 +0000 (02:39 +0100)
commit6f373d75e8923ceb0c6b248b55f65f06dcf69101
tree6b05292005d71a7f9bb41c965ff76794753cfd81
parent53ab7846eeb6cf91bd33dc17598bd5a66b8e3497
parent2e1704059ae8625beda2ffde847ad22c5ba416dc
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter

Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/interlace.h
libavfilter/vf_interlace.c
libavfilter/x86/Makefile
libavfilter/x86/vf_interlace.asm
libavfilter/x86/vf_interlace_init.c