Source code

Revision control

Copy as Markdown

Other Tools

diff --git a/media/ffvpx/libavcodec/x86/vp8dsp.asm b/media/ffvpx/libavcodec/x86/vp8dsp.asm
--- a/media/ffvpx/libavcodec/x86/vp8dsp.asm
+++ b/media/ffvpx/libavcodec/x86/vp8dsp.asm
@@ -173,7 +173,11 @@ SECTION .text
%define MOV movq
%endif
-cglobal put_vp8_epel%1_h6, 6, 6 + npicregs, 6+2*(%1==8), dst, dststride, src, srcstride, height, mx, picreg
+%if %1 == 8
+cglobal put_vp8_epel%1_h6, 6, 6 + npicregs, 8, dst, dststride, src, srcstride, height, mx, picreg
+%else
+cglobal put_vp8_epel%1_h6, 6, 6 + npicregs, 6, dst, dststride, src, srcstride, height, mx, picreg
+%endif
%if %1 == 4
mova m3, [filter4_h6_shuf]
%if PIC
@@ -228,7 +232,11 @@ cglobal put_vp8_epel%1_h6, 6, 6 + npicre
jg .nextrow
RET
-cglobal put_vp8_epel%1_h4, 6, 6 + npicregs, 6+!!(%1 == 8), dst, dststride, src, srcstride, height, mx, picreg
+%if %1 == 8
+cglobal put_vp8_epel%1_h4, 6, 6 + npicregs, 7, dst, dststride, src, srcstride, height, mx, picreg
+%else
+cglobal put_vp8_epel%1_h4, 6, 6 + npicregs, 6, dst, dststride, src, srcstride, height, mx, picreg
+%endif
mova m2, [pw_256]
%if %1 == 8
shl mxd, 4