From 6786280807a6e7711f3e47f9d0588f1ddd4d6f6c Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 10 Dec 2015 12:41:27 -0800 Subject: [PATCH] Fix two msvc build issues Change-Id: Iece22223773dd6d0f87f8f59827705acd2ebe2a4 --- vp10/common/reconintra.c | 2 +- vp10/encoder/bitstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c index b852a655f..e9e3949ad 100644 --- 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 32275d4ae..3765fa879 100644 --- 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); } -- 2.40.0