commit c648a9fd83c5658cbe2a07027687addad12e6af3
author Yaowu Xu <yaowu@google.com> Mon Oct 10 17:39:29 2016 -0700
committer Yaowu Xu <yaowu@google.com> Mon Oct 10 17:39:29 2016 -0700
tree 555a97b94ba2729fb51f251b0f78c8552701713c
parent 607048d6060d570a2db166838b684139351d71dd

Use derived variable size for memcpy

Manually cherry-picked from aom/master:
bf2ad75a1723d223c376b93295aa06dd23226937

Change-Id: I99f05e79ec8ad35a49bc124e6dd829ccc7d9cc36

test/convolve_test.cc

diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 2610264..de1ae04 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -396,8 +396,8 @@
   void CopyOutputToRef() {
     memcpy(output_ref_, output_, kOutputBufferSize);
 #if CONFIG_AOM_HIGHBITDEPTH
-    memcpy(output16_ref_, output16_,
-           kOutputBufferSize * sizeof(output16_ref_[0]));
+    // Copy 16-bit pixels values. The effective number of bytes is double.
+    memcpy(output16_ref_, output16_, sizeof(output16_[0]) * kOutputBufferSize);
 #endif
   }