Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'

* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b': vf_interlace: x86: improve asm performance Conflicts: libavfilter/x86/vf_interlace.asm See: 05e4b25e9b Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 3fe3c8abb1
parent 8c9945285e ca5c3ff909
commit 3fe3c8abb1
1 changed files with 2 additions and 2 deletions
--- a/libavfilter/x86/vf_interlace.asm
+++ b/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 m2, m6, [r2+r1]
-    pxor m3, m6
+    pxor m3, m6, [r2+r1+mmsize]
    pavgb m0, m2
    pavgb m1, m3
    pxor m0, m6