From: Jingning Han <jingning@google.com>
Date: Wed, 11 May 2016 22:50:58 +0000 (-0700)
Subject: Fix highbd masked variance function declaration
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5538c2cb0044b46d0d0292f815fd0b6260c1cbe9;p=libvpx

Fix highbd masked variance function declaration

Fix the variable type mismatch between highbd_calc_masked_var_t and
the actual function definiton. This clears the related compiler
warnings in highbd with ext-inter experiment.

Change-Id: I0423318b16c867ed84700084ad21ca6e42edb321
---

diff --git a/vpx_dsp/x86/masked_variance_intrin_ssse3.c b/vpx_dsp/x86/masked_variance_intrin_ssse3.c
index 47e2c32d8..a0c2b6e85 100644
--- a/vpx_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/vpx_dsp/x86/masked_variance_intrin_ssse3.c
@@ -1380,8 +1380,9 @@ MASK_SUBPIX_VAR_LARGE(128, 128)
 #endif  // CONFIG_EXT_PARTITION
 
 #if CONFIG_VP9_HIGHBITDEPTH
-typedef int (*highbd_calc_masked_var_t)(__m128i v_sum_d, __m128i v_sse_q,
-             unsigned int* sse, const int w, const int h);
+typedef uint32_t (*highbd_calc_masked_var_t)(__m128i v_sum_d, __m128i v_sse_q,
+                                             uint32_t *sse,
+                                             const int w, const int h);
 typedef unsigned int (*highbd_variance_fn_t)(
                       const uint8_t *a8, int a_stride,
                       const uint8_t *b8, int b_stride,