ref: f0bef772be9b748495910b0f44d57efd1a2a8a9c
parent: be0501c875cd7afce56eac1ec117e3348c7cb7ba
parent: 4d2cfeab361e013d225b7c6ab30d0420b2652e28
author: Yaowu Xu <[email protected]>
date: Thu Dec 10 19:53:28 EST 2015
Merge "Proper fix of a msvc complier warning"
--- 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 = (int)remux_tiles(data, data_sz, 1 << n_log2_tiles, mag);
+ data_sz = remux_tiles(data, (int)data_sz, 1 << n_log2_tiles, mag);
} else {
assert(n_log2_tiles == 0);
}