shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix two msvc build issues

Change-Id: Iece22223773dd6d0f87f8f59827705acd2ebe2a4

--- 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;

 }

--- 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);

   }