[FFmpeg-cvslog] x86/h264_weight: use appropriate register size for weight parameters

Hendrik Leppkes git at videolan.org
Tue Mar 21 21:11:38 EET 2017


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Sep 23 09:52:48 2016 +0200| [8d1267932ca9c2e343ef303349101bab6681d02e] | committer: Martin Storsjö

x86/h264_weight: use appropriate register size for weight parameters

This fixes decoding corruption on 64 bit windows.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d1267932ca9c2e343ef303349101bab6681d02e
---

 libavcodec/x86/h264_weight.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm
index 9ad26de..e421ec8 100644
--- a/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@ -134,16 +134,16 @@ WEIGHT_FUNC_HALF_MM 8, 8
     mov  off_regd, r7m
     add  off_regd, 1
     or   off_regd, 1
-    add        r4, 1
-    cmp        r6d, 128
+    add       r4d, 1
+    cmp       r6d, 128
     je .nonnormal
-    cmp        r5, 128
+    cmp       r5d, 128
     jne .normal
 .nonnormal
-    sar        r5, 1
-    sar        r6, 1
+    sar       r5d, 1
+    sar       r6d, 1
     sar  off_regd, 1
-    sub        r4, 1
+    sub       r4d, 1
 .normal
 %if cpuflag(ssse3)
     movd       m4, r5d



More information about the ffmpeg-cvslog mailing list