Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / x86 / dsputilenc_yasm.asm

diff --git a/libavcodec/x86/dsputilenc_yasm.asm b/libavcodec/x86/dsputilenc_yasm.asm
index f52a962f757f80115b76131d68c2d04ce23adc31..b2844a5c72993520c3665d1a780d1024464803d7 100644 (file)
--- a/libavcodec/x86/dsputilenc_yasm.asm
+++ b/libavcodec/x86/dsputilenc_yasm.asm
@@ -284,7 +284,7 @@ HADAMARD8_DIFF_SSE2 ssse3, 9
 INIT_XMM
 ; sse16_sse2(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h)
 cglobal sse16_sse2, 5, 5, 8
-    shr       r4, 1
+    shr      r4d, 1
     pxor      m0, m0         ; mm0 = 0
     pxor      m7, m7         ; mm7 holds the sum