ref: 46025ce5a40e4b57fcf2e375e8f146f077853ceb
parent: 95abad916995a418e900b05e878b93835f40fd71
parent: ad2fa5e7d5508451f72823f72d41a6f43f78c8bf
author: James Zern <jzern@google.com>
date: Thu Feb 13 07:51:36 EST 2014
Merge "vp9/vp9_cx_iface: Silence ts_number_layers MSVC warnings"
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -178,7 +178,7 @@
RANGE_CHECK(cfg, ts_number_layers, 1, VPX_TS_MAX_LAYERS);
if (cfg->ts_number_layers > 1) {
- int i;
+ unsigned int i;
for (i = 1; i < cfg->ts_number_layers; ++i) {
if (cfg->ts_target_bitrate[i] < cfg->ts_target_bitrate[i-1]) {
ERROR("ts_target_bitrate entries are not increasing");
@@ -1045,7 +1045,7 @@
cpi->svc.temporal_layer_id = data->temporal_layer_id;
// Checks on valid layer_id input.
if (cpi->svc.temporal_layer_id < 0 ||
- cpi->svc.temporal_layer_id >= ctx->cfg.ts_number_layers) {
+ cpi->svc.temporal_layer_id >= (int)ctx->cfg.ts_number_layers) {
return VPX_CODEC_INVALID_PARAM;
}
if (cpi->svc.spatial_layer_id < 0 ||
--
⑨