| commit | 15cc8bc72f978c5dd1605f59f9dca0932e1c47f6 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Thu Oct 15 14:39:01 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 15 14:39:01 2015 +0000 |
| tree | d928469cf8ccb6f550c9e28c2061ec79a771401a | |
| parent | 3e1e3ac7893851d1eb43cc6807a4716d11dc58cf [diff] | |
| parent | 8ced62f2506c98e692de701728a9049947772352 [diff] |
Merge "fix a msvc compiler warning"
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index 66da8d4..959b0f0 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c
@@ -846,7 +846,7 @@ else #endif // CONFIG_VP9_HIGHBITDEPTH for (i = 0; i < k; ++i) - pmi->palette_colors[i] = clip_pixel(round(centroids[i])); + pmi->palette_colors[i] = clip_pixel((int)round(centroids[i])); pmi->palette_size[0] = k; vp10_calc_indices(data, centroids, indices, rows * cols, k, 1);