diff options
| author | Minghai Shang <minghai@google.com> | 2015-01-16 15:00:20 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-16 15:00:20 -0800 |
| commit | 31614c7fdb3cc5f303160da20a5ab86b95b43e3b (patch) | |
| tree | 62a70a1c089a8678eb3af8e0215d6a5a730e7b6b | |
| parent | 1be4267ec21e3235027f83e7442c25e7eefbd836 (diff) | |
| parent | 220bc3a0133fe1964df7e49f718877ca7b887552 (diff) | |
| download | libvpx-31614c7fdb3cc5f303160da20a5ab86b95b43e3b.tar libvpx-31614c7fdb3cc5f303160da20a5ab86b95b43e3b.tar.gz libvpx-31614c7fdb3cc5f303160da20a5ab86b95b43e3b.tar.bz2 libvpx-31614c7fdb3cc5f303160da20a5ab86b95b43e3b.zip | |
Merge "[two pass temporal svc]Fix crash issue in transcoder app caused by last fix."
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index ef6174ec6..82bce3780 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -344,7 +344,8 @@ int vp9_svc_start_frame(VP9_COMP *const cpi) { 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 && |