diff options
| author | Johann Koenig <johannkoenig@google.com> | 2018-09-21 18:34:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-21 18:34:02 +0000 |
| commit | c2bbe7154f79e4eff1e62ebeb822bd1f68eec03c (patch) | |
| tree | dbd2030df8f64b273cdff2b66f34d1d450f70db0 | |
| parent | 71b5897f39cb3c710840ae1297749c8758c8bd83 (diff) | |
| parent | 9d3c5d33d1d4558bf8bf67806db353c61eec9080 (diff) | |
| download | libvpx-c2bbe7154f79e4eff1e62ebeb822bd1f68eec03c.tar libvpx-c2bbe7154f79e4eff1e62ebeb822bd1f68eec03c.tar.gz libvpx-c2bbe7154f79e4eff1e62ebeb822bd1f68eec03c.tar.bz2 libvpx-c2bbe7154f79e4eff1e62ebeb822bd1f68eec03c.zip | |
Merge "sanitizer: fix unaligned loads"
| -rw-r--r-- | vpx_dsp/x86/avg_pred_sse2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx_dsp/x86/avg_pred_sse2.c b/vpx_dsp/x86/avg_pred_sse2.c index f83b26490..e7db75559 100644 --- a/vpx_dsp/x86/avg_pred_sse2.c +++ b/vpx_dsp/x86/avg_pred_sse2.c @@ -13,6 +13,7 @@ #include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" +#include "vpx_dsp/x86/mem_sse2.h" void vpx_comp_avg_pred_sse2(uint8_t *comp, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride) { @@ -45,10 +46,9 @@ void vpx_comp_avg_pred_sse2(uint8_t *comp, const uint8_t *pred, int width, r = _mm_loadu_si128((const __m128i *)ref); ref += 16; } else if (width == 4) { - r = _mm_set_epi32(*(const uint32_t *)(ref + 3 * ref_stride), - *(const uint32_t *)(ref + 2 * ref_stride), - *(const uint32_t *)(ref + ref_stride), - *(const uint32_t *)(ref)); + r = _mm_set_epi32(loadu_uint32(ref + 3 * ref_stride), + loadu_uint32(ref + 2 * ref_stride), + loadu_uint32(ref + ref_stride), loadu_uint32(ref)); ref += 4 * ref_stride; } else { |