[FFmpeg-cvslog] avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm

Michael Niedermayer git at videolan.org
Sat Jun 28 16:11:13 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 28 16:01:32 2014 +0200| [a348f4befe23ada291a1982de23ed7d828bdaf0c] | committer: Michael Niedermayer

avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/x86/vf_pullup.asm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/x86/vf_pullup.asm b/libavfilter/x86/vf_pullup.asm
index 4ce8b9b..d3a1955 100644
--- a/libavfilter/x86/vf_pullup.asm
+++ b/libavfilter/x86/vf_pullup.asm
@@ -56,7 +56,7 @@ cglobal pullup_filter_diff, 3, 5, 8, first, second, size
     paddd      m3, m4
     movd      eax, m3
     psrlq      m3, 32
-    movd       r4, m3
+    movd      r4d, m3
     add       eax, r4d
     RET
 
@@ -135,7 +135,7 @@ cglobal pullup_filter_comb, 3, 5, 8, first, second, size
     paddd      m5, m6
     movd      eax, m5
     psrlq      m5, 32
-    movd       r4, m5
+    movd      r4d, m5
     add       eax, r4d
     RET
 
@@ -172,7 +172,7 @@ cglobal pullup_filter_var, 3, 5, 8, first, second, size
     paddd      m3, m4
     movd      eax, m3
     psrlq      m3, 32
-    movd       r4, m3
+    movd      r4d, m3
     add       eax, r4d
     shl       eax, 2
     RET



More information about the ffmpeg-cvslog mailing list