shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I56fad85c,I7401a70a

* changes:
  vp8e_encode: check validate_config return
  vp9_update_layer_...config: delete dead assignment

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -879,7 +879,8 @@

     }

     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 */

     if (ctx->cfg.kf_mode == VPX_KF_AUTO

--- a/vp9/encoder/vp9_svc_layercontext.c

+++ b/vp9/encoder/vp9_svc_layercontext.c

@@ -113,8 +113,6 @@

   if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING) {

     for (sl = 0; sl < oxcf->ss_number_layers; ++sl) {

-      spatial_layer_target = 0;

-

       for (tl = 0; tl < oxcf->ts_number_layers; ++tl) {

         layer = LAYER_IDS_TO_IDX(sl, tl, oxcf->ts_number_layers);

         svc->layer_context[layer].target_bandwidth =