Commit 3fe3c8ab authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ca5c3ff9'

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

Conflicts:
	libavfilter/x86/vf_interlace.asm

See: 05e4b25eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8c994528 ca5c3ff9
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment