aboutsummaryrefslogtreecommitdiff
path: root/libvpx/vp9/common/vp9_alloccommon.c
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2016-08-19 09:09:11 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2016-08-19 09:09:11 -0700
commit737c8493693243838128788fe9c3abc51f17338e (patch)
tree6ad7f9e7f833ab116a47fa042648932e7bc327da /libvpx/vp9/common/vp9_alloccommon.c
parentfcf0f4488cca8e8ae3f516b53e31456d9fad238b (diff)
downloadlibvpx-737c8493693243838128788fe9c3abc51f17338e.tar.gz
libvpx: Cherry-pick 8b4c315 from upstream
Description from upstream: vp9_alloc_context_buffers: clear cm->mi* on failure this fixes a crash in vp9_dec_setup_mi() via vp9_init_context_buffers() should decoding continue and the decoder resyncs on a smaller frame Bug: 30593752 Change-Id: Iafbf1c4114062bf796f51a6b03be71328f7bcc69
Diffstat (limited to 'libvpx/vp9/common/vp9_alloccommon.c')
-rw-r--r--libvpx/vp9/common/vp9_alloccommon.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libvpx/vp9/common/vp9_alloccommon.c b/libvpx/vp9/common/vp9_alloccommon.c
index 7dd1005d3..9826126d9 100644
--- a/libvpx/vp9/common/vp9_alloccommon.c
+++ b/libvpx/vp9/common/vp9_alloccommon.c
@@ -171,6 +171,7 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
return 0;
fail:
+ vp9_set_mb_mi(cm, 0, 0);
vp9_free_context_buffers(cm);
return 1;
}