Merge "Moving FILTER_BITS constant from vp9_convolve.h to vp9_filter.h."

diff --cc vp9/common/mips/dspr2/vp9_convolve2_dspr2.c
Simple merge

diff --cc vp9/encoder/vp9_variance_c.c
index 01d1269af03c8b3c28f441eaa7ec390f06756096,cfda7119fb0883455ff6b2efa14be9a129607319..8bc3850899156a0586149ab06f68ea25602eeb28
--- 1/vp9/encoder/vp9_variance_c.c
--- 2/vp9/encoder/vp9_variance_c.c
+++ b/vp9/encoder/vp9_variance_c.c
@@@ -14,18 -14,18 +14,18 @@@
  #include "vpx/vpx_integer.h"
  
  #include "vp9/common/vp9_common.h"
- #include "vp9/common/vp9_convolve.h"
  #include "vp9/common/vp9_filter.h"
+ 
  #include "vp9/encoder/vp9_variance.h"
  
 -static void variance(const uint8_t *src_ptr,
 -                     int  source_stride,
 -                     const uint8_t *ref_ptr,
 -                     int  recon_stride,
 -                     int  w,
 -                     int  h,
 -                     unsigned int *sse,
 -                     int *sum) {
 +void variance(const uint8_t *src_ptr,
 +              int  source_stride,
 +              const uint8_t *ref_ptr,
 +              int  recon_stride,
 +              int  w,
 +              int  h,
 +              unsigned int *sse,
 +              int *sum) {
    int i, j;
    int diff;