Merge commit 'ca5c3ff9'

* commit 'ca5c3ff9':
  vf_interlace: x86: improve asm performance

Conflicts:
	libavfilter/x86/vf_interlace.asm

See: 05e4b25eMerged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/x86/vf_interlace.asm

@@ -46,8 +46,8 @@ cglobal lowpass_line, 5, 5, 7
     mova m3, [r2+r1+mmsize]
     pxor m0, m6
     pxor m1, m6
-    pxor m2, m6
-    pxor m3, m6
+    pxor m2, m6, [r2+r1]
+    pxor m3, m6, [r2+r1+mmsize]
     pavgb m0, m2
     pavgb m1, m3
     pxor m0, m6