diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 12:31:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 12:31:45 +0100 |
| commit | 3fe3c8abb15a98a118b3476d6847d6a6d436399b (patch) | |
| tree | 347a85bb17b0da357b6ae147b8d402d8e381f324 /libavfilter | |
| parent | 8c9945285e30ed5f7be3b29b0e24f13bde5e5b66 (diff) | |
| parent | ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b (diff) | |
| download | ffmpeg-3fe3c8abb15a98a118b3476d6847d6a6d436399b.tar.gz | |
Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'
* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b':
vf_interlace: x86: improve asm performance
Conflicts:
libavfilter/x86/vf_interlace.asm
See: 05e4b25e9b0a3586033dc21548b03c8e5071efe3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/x86/vf_interlace.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/x86/vf_interlace.asm b/libavfilter/x86/vf_interlace.asm index 2d61d7b80a..21916fdb32 100644 --- 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 m3, m6 + pxor m2, m6, [r2+r1] + pxor m3, m6, [r2+r1+mmsize] pavgb m0, m2 pavgb m1, m3 pxor m0, m6 |