diff options
| author | James Zern <jzern@google.com> | 2015-04-23 20:34:15 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-04-28 19:59:40 -0700 |
| commit | fbd3b89488d48e4221b73d67eab3fdb25e2a6c57 (patch) | |
| tree | 5e0b7fbae2512428a90c90f9028d0722e8c261ac | |
| parent | ccc9e1da8d1ef03a471ab227e1049cd55bebd806 (diff) | |
| download | libvpx-fbd3b89488d48e4221b73d67eab3fdb25e2a6c57.tar libvpx-fbd3b89488d48e4221b73d67eab3fdb25e2a6c57.tar.gz libvpx-fbd3b89488d48e4221b73d67eab3fdb25e2a6c57.tar.bz2 libvpx-fbd3b89488d48e4221b73d67eab3fdb25e2a6c57.zip | |
vpx_mem: remove vpx_memmove
vestigial. replace instances with memmove() which they already were
being defined to.
Change-Id: If396d3f9e3cf79c0ee5d7429615ef3d6b2a34afa
| -rw-r--r-- | vp8/encoder/bitstream.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 | ||||
| -rw-r--r-- | vpx_mem/vpx_mem.c | 4 | ||||
| -rw-r--r-- | vpx_mem/vpx_mem.h | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index f9096f9f0..1e52e4b72 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1620,7 +1620,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest /* concatenate partition buffers */ 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; dp += cpi->partition_sz[i+1]; } diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 56ecd4e0c..7978a13f8 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -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 (idx = 0; idx < num_4x4_blocks_wide; ++idx) - vpx_memmove(&mic->bmi[i + idy * 2 + idx], - &mic->bmi[i], sizeof(mic->bmi[i])); + memmove(&mic->bmi[i + idy * 2 + idx], &mic->bmi[i], sizeof(mic->bmi[i])); return cost_mv_ref(cpi, mode, mbmi->mode_context[mbmi->ref_frame[0]]) + thismvcost; diff --git a/vpx_mem/vpx_mem.c b/vpx_mem/vpx_mem.c index 0eb3f7a40..f944b1090 100644 --- a/vpx_mem/vpx_mem.c +++ b/vpx_mem/vpx_mem.c @@ -109,7 +109,3 @@ void *vpx_memset16(void *dest, int val, size_t length) { return orig; } #endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH - -void *vpx_memmove(void *dest, const void *src, size_t count) { - return memmove(dest, src, count); -} diff --git a/vpx_mem/vpx_mem.h b/vpx_mem/vpx_mem.h index d404efa73..0aaadf52f 100644 --- a/vpx_mem/vpx_mem.h +++ b/vpx_mem/vpx_mem.h @@ -35,13 +35,11 @@ extern "C" { #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH void *vpx_memset16(void *dest, int val, size_t length); #endif - void *vpx_memmove(void *dest, const void *src, size_t count); #ifndef __VPX_MEM_C__ # include <string.h> # define vpx_memcpy memcpy # define vpx_memset memset -# define vpx_memmove memmove #endif #ifdef VPX_MEM_PLTFRM |