commit 6786280807a6e7711f3e47f9d0588f1ddd4d6f6c
author Yaowu Xu <yaowu@google.com> Thu Dec 10 12:41:27 2015 -0800
committer Yaowu Xu <yaowu@google.com> Thu Dec 10 12:41:27 2015 -0800
tree 54984b0adde0aacab51367be36410ea2078f7c3e
parent 221ed5e47bf2861dab989f3aa0387db7088477a9

Fix two msvc build issues

Change-Id: Iece22223773dd6d0f87f8f59827705acd2ebe2a4

vp10/common/reconintra.c

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index b852a65..e9e3949 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -262,7 +262,7 @@
 }
 
 #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;
 }

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 32275d4..3765fa8 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1473,7 +1473,7 @@
     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);
   }