diff options
author | James Zern <jzern@google.com> | 2014-03-28 17:09:31 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-28 17:09:31 -0700 |
commit | 1bc32afd3cfa7ade99d105700dfebf11f0e86729 (patch) | |
tree | cb68668d620e1a4273a1197012755547f7186a9a /vp9/encoder/vp9_onyx_if.c | |
parent | ab961ad01b4652fcca6ada68edf80d3dc5f0fbd4 (diff) | |
parent | 86394d2636a6f5540ad8557ec46092ac8da94a6e (diff) | |
download | libvpx-1bc32afd3cfa7ade99d105700dfebf11f0e86729.tar libvpx-1bc32afd3cfa7ade99d105700dfebf11f0e86729.tar.gz libvpx-1bc32afd3cfa7ade99d105700dfebf11f0e86729.tar.bz2 libvpx-1bc32afd3cfa7ade99d105700dfebf11f0e86729.zip |
Merge "[svc] Fix SvcTest.SecondPassEncode failure"
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 754122e10..ef5349733 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1338,7 +1338,7 @@ VP9_COMP *vp9_create_compressor(VP9_CONFIG *oxcf) { for (i = 0; i < oxcf->ss_number_layers; ++i) { FIRSTPASS_STATS *const last_packet_for_layer = &stats[packets - oxcf->ss_number_layers + i]; - const int layer_id = last_packet_for_layer->spatial_layer_id; + const int layer_id = (int)last_packet_for_layer->spatial_layer_id; const int packets_in_layer = (int)last_packet_for_layer->count + 1; if (layer_id >= 0 && layer_id < oxcf->ss_number_layers) { LAYER_CONTEXT *const lc = &cpi->svc.layer_context[layer_id]; @@ -1357,7 +1357,7 @@ VP9_COMP *vp9_create_compressor(VP9_CONFIG *oxcf) { } for (i = 0; i < packets; ++i) { - const int layer_id = stats[i].spatial_layer_id; + const int layer_id = (int)stats[i].spatial_layer_id; if (layer_id >= 0 && layer_id < oxcf->ss_number_layers && stats_copy[layer_id] != NULL) { *stats_copy[layer_id] = stats[i]; |