[FFmpeg-cvslog] Merge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 28 18:18:41 2017 -0300| [f568d9d0baffb4c3c82a806a6aade464a92052aa] | committer: James Almer

Merge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'

* commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba':
  checkasm: hevc: Add a hevc_ prefix to the add_residual functions

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f568d9d0baffb4c3c82a806a6aade464a92052aa
---

 tests/checkasm/hevc_add_res.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
index 185656ae8c..e92c6b427b 100644
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@ -61,7 +61,7 @@ static void check_add_res(HEVCDSPContext h, int bit_depth)
         memcpy(res1, res0, sizeof(*res0) * size);
         memcpy(dst1, dst0, sizeof(int16_t) * size);
 
-        if (check_func(h.add_residual[i - 2], "add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
+        if (check_func(h.add_residual[i - 2], "hevc_add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
             call_ref(dst0, res0, stride);
             call_new(dst1, res1, stride);
             if (memcmp(dst0, dst1, size))


======================================================================

diff --cc tests/checkasm/hevc_add_res.c
index 185656ae8c,c9ed86b5cc..e92c6b427b
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@@ -59,9 -59,9 +59,9 @@@ static void check_add_res(HEVCDSPContex
          randomize_buffers(res0, size);
          randomize_buffers2(dst0, size);
          memcpy(res1, res0, sizeof(*res0) * size);
 -        memcpy(dst1, dst0, size);
 +        memcpy(dst1, dst0, sizeof(int16_t) * size);
  
-         if (check_func(h.add_residual[i - 2], "add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
+         if (check_func(h.add_residual[i - 2], "hevc_add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
              call_ref(dst0, res0, stride);
              call_new(dst1, res1, stride);
              if (memcmp(dst0, dst1, size))