Commit fbd3b894 authored by James Zern's avatar James Zern

vpx_mem: remove vpx_memmove

vestigial. replace instances with memmove() which they already were
being defined to.

Change-Id: If396d3f9e3cf79c0ee5d7429615ef3d6b2a34afa
parent ccc9e1da
...@@ -1620,7 +1620,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest ...@@ -1620,7 +1620,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest
/* concatenate partition buffers */ /* concatenate partition buffers */
for(i = 0; i < num_part; i++) for(i = 0; i < num_part; i++)
{ {
vpx_memmove(dp, cpi->partition_d[i+1], cpi->partition_sz[i+1]); memmove(dp, cpi->partition_d[i+1], cpi->partition_sz[i+1]);
cpi->partition_d[i+1] = dp; cpi->partition_d[i+1] = dp;
dp += cpi->partition_sz[i+1]; dp += cpi->partition_sz[i+1];
} }
......
...@@ -1321,8 +1321,7 @@ static int set_and_cost_bmi_mvs(VP9_COMP *cpi, MACROBLOCKD *xd, int i, ...@@ -1321,8 +1321,7 @@ static int set_and_cost_bmi_mvs(VP9_COMP *cpi, MACROBLOCKD *xd, int i,
for (idy = 0; idy < num_4x4_blocks_high; ++idy) for (idy = 0; idy < num_4x4_blocks_high; ++idy)
for (idx = 0; idx < num_4x4_blocks_wide; ++idx) for (idx = 0; idx < num_4x4_blocks_wide; ++idx)
vpx_memmove(&mic->bmi[i + idy * 2 + idx], memmove(&mic->bmi[i + idy * 2 + idx], &mic->bmi[i], sizeof(mic->bmi[i]));
&mic->bmi[i], sizeof(mic->bmi[i]));
return cost_mv_ref(cpi, mode, mbmi->mode_context[mbmi->ref_frame[0]]) + return cost_mv_ref(cpi, mode, mbmi->mode_context[mbmi->ref_frame[0]]) +
thismvcost; thismvcost;
......
...@@ -109,7 +109,3 @@ void *vpx_memset16(void *dest, int val, size_t length) { ...@@ -109,7 +109,3 @@ void *vpx_memset16(void *dest, int val, size_t length) {
return orig; return orig;
} }
#endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memmove(void *dest, const void *src, size_t count) {
return memmove(dest, src, count);
}
...@@ -35,13 +35,11 @@ extern "C" { ...@@ -35,13 +35,11 @@ extern "C" {
#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memset16(void *dest, int val, size_t length); void *vpx_memset16(void *dest, int val, size_t length);
#endif #endif
void *vpx_memmove(void *dest, const void *src, size_t count);
#ifndef __VPX_MEM_C__ #ifndef __VPX_MEM_C__
# include <string.h> # include <string.h>
# define vpx_memcpy memcpy # define vpx_memcpy memcpy
# define vpx_memset memset # define vpx_memset memset
# define vpx_memmove memmove
#endif #endif
#ifdef VPX_MEM_PLTFRM #ifdef VPX_MEM_PLTFRM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment