| Index: source/libvpx/vp8/common/reconinter.c
|
| diff --git a/source/libvpx/vp8/common/reconinter.c b/source/libvpx/vp8/common/reconinter.c
|
| index bac3c9474ee5d346315ef4e4bbed488de57d5991..e3025955871319b9347b7c45407180206f2f5444 100644
|
| --- a/source/libvpx/vp8/common/reconinter.c
|
| +++ b/source/libvpx/vp8/common/reconinter.c
|
| @@ -10,6 +10,8 @@
|
|
|
|
|
| #include <limits.h>
|
| +#include <string.h>
|
| +
|
| #include "vpx_config.h"
|
| #include "vp8_rtcd.h"
|
| #include "vpx/vpx_integer.h"
|
| @@ -30,31 +32,8 @@ void vp8_copy_mem16x16_c(
|
|
|
| for (r = 0; r < 16; r++)
|
| {
|
| -#if !(CONFIG_FAST_UNALIGNED)
|
| - dst[0] = src[0];
|
| - dst[1] = src[1];
|
| - dst[2] = src[2];
|
| - dst[3] = src[3];
|
| - dst[4] = src[4];
|
| - dst[5] = src[5];
|
| - dst[6] = src[6];
|
| - dst[7] = src[7];
|
| - dst[8] = src[8];
|
| - dst[9] = src[9];
|
| - dst[10] = src[10];
|
| - dst[11] = src[11];
|
| - dst[12] = src[12];
|
| - dst[13] = src[13];
|
| - dst[14] = src[14];
|
| - dst[15] = src[15];
|
| -
|
| -#else
|
| - ((uint32_t *)dst)[0] = ((uint32_t *)src)[0] ;
|
| - ((uint32_t *)dst)[1] = ((uint32_t *)src)[1] ;
|
| - ((uint32_t *)dst)[2] = ((uint32_t *)src)[2] ;
|
| - ((uint32_t *)dst)[3] = ((uint32_t *)src)[3] ;
|
| + memcpy(dst, src, 16);
|
|
|
| -#endif
|
| src += src_stride;
|
| dst += dst_stride;
|
|
|
| @@ -72,19 +51,8 @@ void vp8_copy_mem8x8_c(
|
|
|
| for (r = 0; r < 8; r++)
|
| {
|
| -#if !(CONFIG_FAST_UNALIGNED)
|
| - dst[0] = src[0];
|
| - dst[1] = src[1];
|
| - dst[2] = src[2];
|
| - dst[3] = src[3];
|
| - dst[4] = src[4];
|
| - dst[5] = src[5];
|
| - dst[6] = src[6];
|
| - dst[7] = src[7];
|
| -#else
|
| - ((uint32_t *)dst)[0] = ((uint32_t *)src)[0] ;
|
| - ((uint32_t *)dst)[1] = ((uint32_t *)src)[1] ;
|
| -#endif
|
| + memcpy(dst, src, 8);
|
| +
|
| src += src_stride;
|
| dst += dst_stride;
|
|
|
| @@ -102,19 +70,8 @@ void vp8_copy_mem8x4_c(
|
|
|
| for (r = 0; r < 4; r++)
|
| {
|
| -#if !(CONFIG_FAST_UNALIGNED)
|
| - dst[0] = src[0];
|
| - dst[1] = src[1];
|
| - dst[2] = src[2];
|
| - dst[3] = src[3];
|
| - dst[4] = src[4];
|
| - dst[5] = src[5];
|
| - dst[6] = src[6];
|
| - dst[7] = src[7];
|
| -#else
|
| - ((uint32_t *)dst)[0] = ((uint32_t *)src)[0] ;
|
| - ((uint32_t *)dst)[1] = ((uint32_t *)src)[1] ;
|
| -#endif
|
| + memcpy(dst, src, 8);
|
| +
|
| src += src_stride;
|
| dst += dst_stride;
|
|
|
|
|