Merge changes from topic 'missing-proto'

* changes:
  vp8/rdopt.h+onyx_int.h: add some missing prototypes
  vp8: add some missing includes
  vp8: make some functions static
  vp8/common/variance*: add vp8_rtcd include
  vp8_copy32xn: sync function signature

12 files changed, 15 insertions, 7 deletions

diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index b9d875a2f..8dfd4ce20 100644
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -10,6 +10,7 @@
 
 
 #include "vpx_config.h"
+#include "alloccommon.h"
 #include "blockd.h"
 #include "vpx_mem/vpx_mem.h"
 #include "onyxc_int.h"
diff --git a/vp8/common/copy_c.c b/vp8/common/copy_c.c
index fd96c8634..e3392913f 100644
--- a/vp8/common/copy_c.c
+++ b/vp8/common/copy_c.c
@@ -11,11 +11,11 @@
 
 #include <string.h>
 
-#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/filter.c b/vp8/common/filter.c
index 25266f868..84c608eff 100644
--- a/vp8/common/filter.c
+++ b/vp8/common/filter.c
@@ -10,6 +10,7 @@
 
 
 #include "filter.h"
+#include "./vp8_rtcd.h"
 
 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]) =
 {
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c
index d84df3348..4393ced48 100644
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -17,6 +17,7 @@
 #include "vpx_ports/x86.h"
 #endif
 #include "vp8/common/onyxc_int.h"
+#include "vp8/common/systemdependent.h"
 
 #if CONFIG_MULTITHREAD
 #if HAVE_UNISTD_H && !defined(__OS2__)
diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c
index 47af52f04..f5403c5aa 100644
--- a/vp8/common/idctllm.c
+++ b/vp8/common/idctllm.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp8_rtcd.h"
 
 /****************************************************************************
  * Notes:
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index 266431a32..a4e6ae170 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -427,7 +427,7 @@ void vp8_de_noise(VP8_COMMON                 *cm,
     }
 }
 
-double vp8_gaussian(double sigma, double mu, double x)
+static double gaussian(double sigma, double mu, double x)
 {
     return 1 / (sigma * sqrt(2.0 * 3.14159265)) *
            (exp(-(x - mu) * (x - mu) / (2 * sigma * sigma)));
@@ -455,7 +455,7 @@ static void fillrd(struct postproc_state *state, int q, int a)
 
         for (i = -32; i < 32; i++)
         {
-            const int v = (int)(.5 + 256 * vp8_gaussian(sigma, 0, i));
+            const int v = (int)(.5 + 256 * gaussian(sigma, 0, i));
 
             if (v)
             {
diff --git a/vp8/common/rtcd_defs.pl b/vp8/common/rtcd_defs.pl
index 56b7db7ec..c9f14d58a 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 552a28025..b62cc6136 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);
 
diff --git a/vp8/common/variance_c.c b/vp8/common/variance_c.c
index 773b655ef..dc95bfeb3 100644
--- a/vp8/common/variance_c.c
+++ b/vp8/common/variance_c.c
@@ -9,8 +9,9 @@
  */
 
 
-#include "variance.h"
+#include "./vp8_rtcd.h"
 #include "filter.h"
+#include "variance.h"
 
 
 unsigned int vp8_get_mb_ss_c
diff --git a/vp8/common/x86/variance_mmx.c b/vp8/common/x86/variance_mmx.c
index 02e02420f..10a58b822 100644
--- a/vp8/common/x86/variance_mmx.c
+++ b/vp8/common/x86/variance_mmx.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp8_rtcd.h"
 #include "vpx_config.h"
 #include "vp8/common/variance.h"
 #include "vpx_ports/mem.h"
diff --git a/vp8/common/x86/variance_sse2.c b/vp8/common/x86/variance_sse2.c
index 1fe127bf2..6c6539d8e 100644
--- a/vp8/common/x86/variance_sse2.c
+++ b/vp8/common/x86/variance_sse2.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp8_rtcd.h"
 #include "vpx_config.h"
 #include "vp8/common/variance.h"
 #include "vpx_ports/mem.h"
diff --git a/vp8/common/x86/variance_ssse3.c b/vp8/common/x86/variance_ssse3.c
index 73eb90df6..d8c8da540 100644
--- a/vp8/common/x86/variance_ssse3.c
+++ b/vp8/common/x86/variance_ssse3.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp8_rtcd.h"
 #include "vpx_config.h"
 #include "vp8/common/variance.h"
 #include "vpx_ports/mem.h"