shithub: libvpx

Info  •  Files  •  Log  •  Branches

vpx_mem: remove vpx_memmove

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

Change-Id: If396d3f9e3cf79c0ee5d7429615ef3d6b2a34afa

--- a/vp8/encoder/bitstream.c

+++ b/vp8/encoder/bitstream.c

@@ -1620,7 +1620,7 @@

             /* 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];

             }

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1321,8 +1321,7 @@

   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;

--- a/vpx_mem/vpx_mem.c

+++ b/vpx_mem/vpx_mem.c

@@ -109,7 +109,3 @@

   return orig;

 }

 #endif  // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH

-

-void *vpx_memmove(void *dest, const void *src, size_t count) {

-  return memmove(dest, src, count);

-}

--- a/vpx_mem/vpx_mem.h

+++ b/vpx_mem/vpx_mem.h

@@ -35,13 +35,11 @@

 #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