summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_mcomp.c
diff options
context:
space:
mode:
authorJim Bankoski <jimbankoski@google.com>2013-02-28 08:32:14 -0800
committerJim Bankoski <jimbankoski@google.com>2013-02-28 08:46:35 -0800
commit714aa9f3c072624186df161589bacbb778369312 (patch)
tree22563b7ebd98666e4c29430196f2fdcde37e6b0d /vp9/encoder/vp9_mcomp.c
parentb715e371c05324c84b3a58ca19f5348caa2ff695 (diff)
downloadlibvpx-714aa9f3c072624186df161589bacbb778369312.tar
libvpx-714aa9f3c072624186df161589bacbb778369312.tar.gz
libvpx-714aa9f3c072624186df161589bacbb778369312.tar.bz2
libvpx-714aa9f3c072624186df161589bacbb778369312.zip
this commit converts all sad ptrs to uint32
sse4_1 code used uint16_t for returning sad, but that won't work for 32x32 or 64x64. This code fixes the assembly for those and also reenables sse4_1 on linux Change-Id: I5ce7288d581db870a148e5f7c5092826f59edd81
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
-rw-r--r--vp9/encoder/vp9_mcomp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index 64d8d7d6c..5287f9785 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -1782,7 +1782,7 @@ int vp9_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
int col_min = ref_col - distance;
int col_max = ref_col + distance;
- DECLARE_ALIGNED_ARRAY(16, uint16_t, sad_array8, 8);
+ DECLARE_ALIGNED_ARRAY(16, uint32_t, sad_array8, 8);
unsigned int sad_array[3];
int_mv fcenter_mv;