shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "[two pass temporal svc]Fix crash issue in transcoder app caused by last fix."

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

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

@@ -344,7 +344,8 @@

   buf = vp9_lookahead_peek(cpi->lookahead, 0);

   if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2 &&

       cpi->svc.encode_empty_frame_state == NEED_TO_ENCODE &&

-      lc->rc.frames_to_key != 0 && !(buf->flags & VPX_EFLAG_FORCE_KF)) {

+      lc->rc.frames_to_key != 0 &&

+      !(buf != NULL && (buf->flags & VPX_EFLAG_FORCE_KF))) {

     if ((cpi->svc.number_temporal_layers > 1 &&

          cpi->svc.temporal_layer_id < cpi->svc.number_temporal_layers - 1) ||

         (cpi->svc.number_spatial_layers > 1 &&