From 6eb1016301f9b4c5d438885629f668f46386bea7 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 14 May 2015 19:41:13 -0700 Subject: [PATCH] vp8_copy32xn: sync function signature + include vp8_rtcd.h in copy_c.c silences missing prototype warnings Change-Id: Iecc279c695b08a26b231dedb41e3b84c551703f3 --- vp8/common/copy_c.c | 4 ++-- vp8/common/rtcd_defs.pl | 2 +- vp8/common/variance.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vp8/common/copy_c.c b/vp8/common/copy_c.c index fd96c86..e339291 100644 --- a/vp8/common/copy_c.c +++ b/vp8/common/copy_c.c @@ -11,11 +11,11 @@ #include -#include "vpx_config.h" +#include "./vp8_rtcd.h" #include "vpx/vpx_integer.h" /* Copy 2 macroblocks to a buffer */ -void vp8_copy32xn_c(unsigned char *src_ptr, int src_stride, +void vp8_copy32xn_c(const unsigned char *src_ptr, int src_stride, unsigned char *dst_ptr, int dst_stride, int height) { diff --git a/vp8/common/rtcd_defs.pl b/vp8/common/rtcd_defs.pl index 56b7db7..c9f14d5 100644 --- a/vp8/common/rtcd_defs.pl +++ b/vp8/common/rtcd_defs.pl @@ -333,7 +333,7 @@ specialize qw/vp8_get4x4sse_cs mmx neon/; # Block copy # if ($opts{arch} =~ /x86/) { - add_proto qw/void vp8_copy32xn/, "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n"; + add_proto qw/void vp8_copy32xn/, "const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n"; specialize qw/vp8_copy32xn sse2 sse3/; } diff --git a/vp8/common/variance.h b/vp8/common/variance.h index 552a280..b62cc61 100644 --- a/vp8/common/variance.h +++ b/vp8/common/variance.h @@ -29,7 +29,7 @@ typedef unsigned int(*vpx_sad_fn_t)( typedef void (*vp8_copy32xn_fn_t)( const unsigned char *src_ptr, int source_stride, - const unsigned char *ref_ptr, + unsigned char *ref_ptr, int ref_stride, int n); -- 2.7.4