diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-11-05 15:34:13 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-11-05 15:34:13 -0800 |
| commit | 7e491de1c487186bd2adb6b6907b8d0d1869f846 (patch) | |
| tree | 575ee303ea6f8e626897d50288ccd7c97044df11 /vp9/encoder/vp9_variance.c | |
| parent | 92440e82fd01132a179f20a43b0d3b3557dfba10 (diff) | |
| parent | 2c4fee17bcd3e64d8f831c637b34caab98e965d5 (diff) | |
| download | libvpx-7e491de1c487186bd2adb6b6907b8d0d1869f846.tar libvpx-7e491de1c487186bd2adb6b6907b8d0d1869f846.tar.gz libvpx-7e491de1c487186bd2adb6b6907b8d0d1869f846.tar.bz2 libvpx-7e491de1c487186bd2adb6b6907b8d0d1869f846.zip | |
Merge "Fix visual studio 2013 compiler warnings"
Diffstat (limited to 'vp9/encoder/vp9_variance.c')
| -rw-r--r-- | vp9/encoder/vp9_variance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_variance.c b/vp9/encoder/vp9_variance.c index 4555bde1e..fea5f3351 100644 --- a/vp9/encoder/vp9_variance.c +++ b/vp9/encoder/vp9_variance.c @@ -298,8 +298,8 @@ void highbd_variance(const uint8_t *a8, int a_stride, uint64_t sse_long = 0; uint64_t sum_long = 0; highbd_variance64(a8, a_stride, b8, b_stride, w, h, &sse_long, &sum_long); - *sse = sse_long; - *sum = sum_long; + *sse = (unsigned int)sse_long; + *sum = (int)sum_long; } void highbd_10_variance(const uint8_t *a8, int a_stride, @@ -309,8 +309,8 @@ void highbd_10_variance(const uint8_t *a8, int a_stride, uint64_t sse_long = 0; uint64_t sum_long = 0; highbd_variance64(a8, a_stride, b8, b_stride, w, h, &sse_long, &sum_long); - *sum = ROUND_POWER_OF_TWO(sum_long, 2); - *sse = ROUND_POWER_OF_TWO(sse_long, 4); + *sum = (int)ROUND_POWER_OF_TWO(sum_long, 2); + *sse = (unsigned int)ROUND_POWER_OF_TWO(sse_long, 4); } void highbd_12_variance(const uint8_t *a8, int a_stride, @@ -320,8 +320,8 @@ void highbd_12_variance(const uint8_t *a8, int a_stride, uint64_t sse_long = 0; uint64_t sum_long = 0; highbd_variance64(a8, a_stride, b8, b_stride, w, h, &sse_long, &sum_long); - *sum = ROUND_POWER_OF_TWO(sum_long, 4); - *sse = ROUND_POWER_OF_TWO(sse_long, 8); + *sum = (int)ROUND_POWER_OF_TWO(sum_long, 4); + *sse = (unsigned int)ROUND_POWER_OF_TWO(sse_long, 8); } static void highbd_var_filter_block2d_bil_first_pass( |