commit b37a0041c10c6fccd0fa4522a180b56cf93e9e05
author android-build-team Robot <android-build-team-robot@google.com> Wed Sep 13 22:09:57 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 13 22:09:57 2017 +0000
tree a0185d3681b769e6d18259ee5556f5d47a47660c
parent 24483a79dd6af85bfdea1aaf86b11a4573e679f6
parent 9d8f4362a8686aa6af3ddcef4aad070a93bf45f5

Merge cherrypicks of [2891344, 2891345, 2891346, 2891347, 2892593, 2892594, 2892595, 2892596, 2891196, 2891255, 2891348, 2892570, 2892598, 2892599, 2892601, 2892602, 2892603, 2892604, 2892605, 2892606, 2892607, 2892608, 2892669, 2892670, 2892671, 2892672, 2892673, 2892479, 2891273, 2891205, 2892674, 2892709, 2892630, 2891206, 2891207, 2891208, 2892729, 2892730, 2892731, 2892732] into nyc-bugfix-release

Change-Id: Ieefc4facdce6dbbeb46246386aee4769d09a5c09

libvpx/vp9/common/vp9_alloccommon.c

diff --git a/libvpx/vp9/common/vp9_alloccommon.c b/libvpx/vp9/common/vp9_alloccommon.c
index 24c6c54..aaf9a75 100644
--- a/libvpx/vp9/common/vp9_alloccommon.c
+++ b/libvpx/vp9/common/vp9_alloccommon.c
@@ -164,6 +164,7 @@
   return 0;
 
  fail:
+  vp9_set_mb_mi(cm, 0, 0);
   vp9_free_context_buffers(cm);
   return 1;
 }