Commit 205532f3 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge changes I56fad85c,I7401a70a

* changes:
  vp8e_encode: check validate_config return
  vp9_update_layer_...config: delete dead assignment
parents 9a733b39 c0523090
...@@ -879,7 +879,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx, ...@@ -879,7 +879,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx,
} }
ctx->control_frame_flags = 0; ctx->control_frame_flags = 0;
res = set_reference_and_update(ctx, flags); if (!res)
res = set_reference_and_update(ctx, flags);
/* Handle fixed keyframe intervals */ /* Handle fixed keyframe intervals */
if (ctx->cfg.kf_mode == VPX_KF_AUTO if (ctx->cfg.kf_mode == VPX_KF_AUTO
......
...@@ -113,8 +113,6 @@ void vp9_update_layer_context_change_config(VP9_COMP *const cpi, ...@@ -113,8 +113,6 @@ void vp9_update_layer_context_change_config(VP9_COMP *const cpi,
if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING) { if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING) {
for (sl = 0; sl < oxcf->ss_number_layers; ++sl) { for (sl = 0; sl < oxcf->ss_number_layers; ++sl) {
spatial_layer_target = 0;
for (tl = 0; tl < oxcf->ts_number_layers; ++tl) { for (tl = 0; tl < oxcf->ts_number_layers; ++tl) {
layer = LAYER_IDS_TO_IDX(sl, tl, oxcf->ts_number_layers); layer = LAYER_IDS_TO_IDX(sl, tl, oxcf->ts_number_layers);
svc->layer_context[layer].target_bandwidth = svc->layer_context[layer].target_bandwidth =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment