summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorMinghai Shang <minghai@google.com>2015-01-15 15:44:11 -0800
committerMinghai Shang <minghai@google.com>2015-01-15 16:59:54 -0800
commit220bc3a0133fe1964df7e49f718877ca7b887552 (patch)
treea2aa8293095d7f5ba27f34e7a6eadcf67086b56a /vp9
parent7ef157cccec52657529495206383331c279397f1 (diff)
downloadlibvpx-220bc3a0133fe1964df7e49f718877ca7b887552.tar
libvpx-220bc3a0133fe1964df7e49f718877ca7b887552.tar.gz
libvpx-220bc3a0133fe1964df7e49f718877ca7b887552.tar.bz2
libvpx-220bc3a0133fe1964df7e49f718877ca7b887552.zip
[two pass temporal svc]Fix crash issue in transcoder app caused by last fix.
Change-Id: I78ecc8ec3fa3ba5f69bb23813e68a5255d0534e1
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_svc_layercontext.c3
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 &&