diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:11:26 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:19:59 -0800 |
| commit | 879cb7d96259a71eea0038452a00241650589084 (patch) | |
| tree | 4d8c0a86fcdb6655d10647837e6c3adfb38639c4 /vp9/encoder/x86/vp9_sad_ssse3.asm | |
| parent | c14439c3d3db8dfa44a30c4edc50f56250ce4cd3 (diff) | |
| parent | bdca030cafc31446afc1685906f7c44e1850ed84 (diff) | |
| download | libvpx-879cb7d96259a71eea0038452a00241650589084.tar libvpx-879cb7d96259a71eea0038452a00241650589084.tar.gz libvpx-879cb7d96259a71eea0038452a00241650589084.tar.bz2 libvpx-879cb7d96259a71eea0038452a00241650589084.zip | |
Merge vp9-preview changes into experimental branch
Incorportate vp9-preview changes by merging master branch into experimental.
Conflicts:
test/test.mk
vp9/common/vp9_filter.c
vp9/common/vp9_idctllm.c
vp9/common/vp9_invtrans.h
vp9/common/vp9_mbpitch.c
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_systemdependent.h
vp9/common/vp9_type_aliases.h
vp9/common/x86/vp9_asm_stubs.c
vp9/common/x86/vp9_subpixel_mmx.asm
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_dequantize.c
vp9/decoder/vp9_dequantize.h
vp9/decoder/vp9_onyxd_int.h
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rdopt.c
Change-Id: I17f51c3666d1b59cf1a699f87607cbc5d30a87c5
Diffstat (limited to 'vp9/encoder/x86/vp9_sad_ssse3.asm')
| -rw-r--r-- | vp9/encoder/x86/vp9_sad_ssse3.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/x86/vp9_sad_ssse3.asm b/vp9/encoder/x86/vp9_sad_ssse3.asm index 5623d8be4..0cb35424e 100644 --- a/vp9/encoder/x86/vp9_sad_ssse3.asm +++ b/vp9/encoder/x86/vp9_sad_ssse3.asm @@ -152,7 +152,7 @@ ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp9_sad16x16x3_ssse3) +global sym(vp9_sad16x16x3_ssse3) PRIVATE sym(vp9_sad16x16x3_ssse3): push rbp mov rbp, rsp @@ -265,7 +265,7 @@ sym(vp9_sad16x16x3_ssse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp9_sad16x8x3_ssse3) +global sym(vp9_sad16x8x3_ssse3) PRIVATE sym(vp9_sad16x8x3_ssse3): push rbp mov rbp, rsp |