diff options
author | James Almer <jamrial@gmail.com> | 2014-06-08 22:21:30 -0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-15 02:14:55 +0200 |
commit | 0edc79962641dd853cda187ee13b617701346061 (patch) | |
tree | 7695dadfa438b131bf47c037c8b167e274ef56bd | |
parent | 3cf6135729bb8c9a56fdecd107be1b24a0fdd386 (diff) | |
download | ffmpeg-0edc79962641dd853cda187ee13b617701346061.tar.gz |
x86/scale: fix xmm register count for hscale*_sse2n2.2.5
xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 345f2234d1717d6128b2f90a7839c4906bf203ec)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libswscale/x86/scale.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 940f35744e..7af92f7f52 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -424,7 +424,7 @@ INIT_MMX mmx SCALE_FUNCS2 0, 0, 0 %endif INIT_XMM sse2 -SCALE_FUNCS2 6, 7, 8 +SCALE_FUNCS2 7, 6, 8 INIT_XMM ssse3 SCALE_FUNCS2 6, 6, 8 INIT_XMM sse4 |