diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-09-17 09:45:13 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-09-17 12:08:51 -0700 |
| commit | a783da80e7929d4de5180336a4a620767555d9a0 (patch) | |
| tree | 16261b563cc67dd951f91e759c74d36e96e7a0be /vp9/encoder/vp9_encodeframe.c | |
| parent | 84758960db7e18cd77e301ab4a1dc6022e1a3335 (diff) | |
| download | libvpx-a783da80e7929d4de5180336a4a620767555d9a0.tar libvpx-a783da80e7929d4de5180336a4a620767555d9a0.tar.gz libvpx-a783da80e7929d4de5180336a4a620767555d9a0.tar.bz2 libvpx-a783da80e7929d4de5180336a4a620767555d9a0.zip | |
Silence a bunch of MSVC warnings
Change-Id: I16633269582a640809dca27572bbe99efa6369fc
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 44ab02d2e..3b92a3905 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -936,7 +936,7 @@ static void copy_partitioning(VP9_COMP *cpi, MODE_INFO **mi_8x8, for (block_col = 0; block_col < 8; ++block_col) { MODE_INFO * prev_mi = prev_mi_8x8[block_row * mis + block_col]; BLOCK_SIZE sb_type = prev_mi ? prev_mi->mbmi.sb_type : 0; - int offset; + ptrdiff_t offset; if (prev_mi) { offset = prev_mi - cm->prev_mi; @@ -1044,9 +1044,9 @@ static void fill_variance(var *v, int64_t s2, int64_t s, int c) { v->sum_error = s; v->count = c; if (c > 0) - v->variance = 256 + v->variance = (int)(256 * (v->sum_square_error - v->sum_error * v->sum_error / v->count) - / v->count; + / v->count); else v->variance = 0; } |