diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-09-24 09:07:08 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-09-24 10:56:06 -0700 |
| commit | 9be0bb19df2625254831d4ef0f3995b14a8ba0ed (patch) | |
| tree | 253ef5b37eb6de3cb79d9b4c70bf8c847df743db | |
| parent | fe533c97413313a4e4c75ce1a1a6ec7451b5acc3 (diff) | |
| download | libvpx-9be0bb19df2625254831d4ef0f3995b14a8ba0ed.tar libvpx-9be0bb19df2625254831d4ef0f3995b14a8ba0ed.tar.gz libvpx-9be0bb19df2625254831d4ef0f3995b14a8ba0ed.tar.bz2 libvpx-9be0bb19df2625254831d4ef0f3995b14a8ba0ed.zip | |
Replace memcpy with vpx_memcpy
Also removed obselete comment
Change-Id: Iae1664777d76383639c637ee786e0d50fc45819a
| -rw-r--r-- | vp9/common/vp9_convolve.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_findnearmv.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/vp9/common/vp9_convolve.c b/vp9/common/vp9_convolve.c index abedf6b27..1705402c2 100644 --- a/vp9/common/vp9_convolve.c +++ b/vp9/common/vp9_convolve.c @@ -282,7 +282,7 @@ void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, int r; for (r = h; r > 0; --r) { - memcpy(dst, src, w); + vpx_memcpy(dst, src, w); src += src_stride; dst += dst_stride; } diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c index 49a731fdb..73f6b4c19 100644 --- a/vp9/common/vp9_findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -54,7 +54,7 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd, dst_list[1].as_int = 0; if (block_idx == 0) { - memcpy(dst_list, mv_list, MAX_MV_REF_CANDIDATES * sizeof(int_mv)); + vpx_memcpy(dst_list, mv_list, MAX_MV_REF_CANDIDATES * sizeof(int_mv)); } else if (block_idx == 1 || block_idx == 2) { int dst = 0, n; union b_mode_info *bmi = mi->bmi; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 041316b4f..f00cd14f8 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2242,11 +2242,9 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx, vpx_memcpy(ctx->zcoeff_blk, x->zcoeff_blk[xd->this_mi->mbmi.tx_size], sizeof(ctx->zcoeff_blk)); - // FIXME(rbultje) does this memcpy the whole array? I believe sizeof() - // doesn't actually work this way - memcpy(ctx->tx_rd_diff, tx_size_diff, sizeof(ctx->tx_rd_diff)); - memcpy(ctx->best_filter_diff, best_filter_diff, - sizeof(*best_filter_diff) * (SWITCHABLE_FILTERS + 1)); + vpx_memcpy(ctx->tx_rd_diff, tx_size_diff, sizeof(ctx->tx_rd_diff)); + vpx_memcpy(ctx->best_filter_diff, best_filter_diff, + sizeof(*best_filter_diff) * (SWITCHABLE_FILTERS + 1)); } static void setup_pred_block(const MACROBLOCKD *xd, |