libvpx: Pull from upstream

source/libvpx/vp8/encoder/bitstream.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1525 matching lines @@
 #endif
 
     vp8_clear_system_state();
 
 #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
     pack_coef_probs(cpi);
 #else
     if (pc->refresh_entropy_probs == 0)
     {
         /* save a copy for later refresh */
-        vpx_memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc));
+        memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc));
     }
 
     vp8_update_coef_probs(cpi);
 #endif
 
 #ifdef VP8_ENTROPY_STATS
     active_section = 2;
 #endif
 
     /* Write out the mb_no_coeff_skip flag */
@@ skipping 56 matching lines @@
                 write_partition_size(dp, cpi->partition_sz[i]);
                 dp += 3;
             }
         }
 
         if (!cpi->output_partition)
         {
             /* 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];
             }
         }
 
         /* update total size */
         *size = 0;
         for(i = 0; i < num_part+1; i++)
         {
             *size += cpi->partition_sz[i];
@@ skipping 94 matching lines @@
             fprintf(f, "    },\n");
         }
 
         fprintf(f, "  },\n");
     }
 
     fprintf(f, "};\n");
     fclose(f);
 }
 #endif