Fix two msvc build issues

Change-Id: Iece22223773dd6d0f87f8f59827705acd2ebe2a4

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index b852a655f629c90ec8022696c5e7ea99e19c03da..e9e3949ad7c80568a7ea7c258dbc910b9d174dd3 100644 (file)
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -262,7 +262,7 @@ static void vp10_init_intra_predictors_internal(void) {
 }
 
 #if CONFIG_MISC_FIXES
-static inline void memset16(uint16_t *dst, int val, int n) {
+static INLINE void memset16(uint16_t *dst, int val, int n) {
   while (n--)
     *dst++ = val;
 }

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 32275d4aed22ea3e1135a01fc65e72e52d4ff8d2..3765fa879ffdc2616c663c2ad1a2815677146366 100644 (file)
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1473,7 +1473,7 @@ void vp10_pack_bitstream(VP10_COMP *const cpi, uint8_t *dest, size_t *size) {
     assert(n_log2_tiles > 0);
     vpx_wb_write_literal(&saved_wb, mag, 2);
     if (mag < 3)
-      data_sz = remux_tiles(data, data_sz, 1 << n_log2_tiles, mag);
+      data_sz = (int)remux_tiles(data, data_sz, 1 << n_log2_tiles, mag);
   } else {
     assert(n_log2_tiles == 0);
   }