diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-26 10:22:42 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-26 10:22:42 -0400 |
| commit | 62400028e22b3544eac09724afe45f3cd55766a1 (patch) | |
| tree | 8b9da3086125517a9e93ed2c3370d49b0e3cf8b8 /vp8/encoder/x86/sad_sse3.asm | |
| parent | 96513c42b2e34ea096edd9eb649120362c71836f (diff) | |
| parent | ca7e346669ce7d9a410edc19a828f9ca9637626d (diff) | |
| download | libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar.gz libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar.bz2 libvpx-62400028e22b3544eac09724afe45f3cd55766a1.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/decoder/detokenize.c
vp8/decoder/onyxd_int.h
Change-Id: Ib9b516b939358ac8bf694200a8425fdd62c8d149
Diffstat (limited to 'vp8/encoder/x86/sad_sse3.asm')
| -rw-r--r-- | vp8/encoder/x86/sad_sse3.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/x86/sad_sse3.asm b/vp8/encoder/x86/sad_sse3.asm index 1c41c322a..9e0552166 100644 --- a/vp8/encoder/x86/sad_sse3.asm +++ b/vp8/encoder/x86/sad_sse3.asm @@ -43,7 +43,7 @@ %define ret_var r11 %define result_ptr [rsp+xmm_stack_space+8+4*8] %define max_err [rsp+xmm_stack_space+8+4*8] - %define height [rsp+xmm_stack_space+8+4*8] + %define height dword ptr [rsp+xmm_stack_space+8+4*8] %else %define src_ptr rdi %define src_stride rsi |