shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "A couple more V.S. warnings silenced."

--- a/vp9/encoder/vp9_quantize.c

+++ b/vp9/encoder/vp9_quantize.c

@@ -26,7 +26,7 @@

                       const int16_t *dequant_ptr,

                       int zbin_oq_value, uint16_t *eob_ptr,

                       const int16_t *scan, const int16_t *iscan) {

-  int i, non_zero_count = count, eob = -1;

+  int i, non_zero_count = (int)count, eob = -1;

   const int zbins[2] = { zbin_ptr[0] + zbin_oq_value,

                          zbin_ptr[1] + zbin_oq_value };

   const int nzbins[2] = { zbins[0] * -1,

@@ -37,7 +37,7 @@

   if (!skip_block) {

     // Pre-scan pass

-    for (i = count - 1; i >= 0; i--) {

+    for (i = (int)count - 1; i >= 0; i--) {

       const int rc = scan[i];

       const int coeff = coeff_ptr[rc];

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -257,7 +257,8 @@

     add_token(&t, coef_probs[band[c]][pt],

               vp9_dct_value_tokens_ptr[v].extra,

-              vp9_dct_value_tokens_ptr[v].token, skip_eob,

+              (uint8_t)vp9_dct_value_tokens_ptr[v].token,

+              (uint8_t)skip_eob,

               counts[band[c]][pt]);

     eob_branch[band[c]][pt] += !skip_eob;

-- 

⑨