Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswscale / x86 / output.asm

diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index 874fac21af62195ebe4166471b39afccb95d59e8..01a946f7b381e92d24ea290112b5286b8c26dc20 100644 (file)
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -62,11 +62,11 @@ SECTION .text
 %define cntr_reg fltsizeq
 %define movsx mov
 %else
-%define cntr_reg r11
+%define cntr_reg r7
 %define movsx movsxd
 %endif
 
-cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset
+cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset
 %if %1 == 8 || %1 == 9 || %1 == 10
     pxor            m6,  m6
 %endif ; %1 == 8/9/10