aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-07-26 23:18:13 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-07-26 23:18:13 +0000
commit0fef8b69f1b1e640dc160b3dcc29813b4c79fbfb (patch)
treea0185d3681b769e6d18259ee5556f5d47a47660c
parent3c47451115220647bed9c0bb0ac55c1049e3fdf0 (diff)
parent963f814fc67814d462070e29266056597da37e35 (diff)
downloadlibvpx-android-7.1.1_r53.tar.gz
Merge cherrypicks of [2604297, 2604299, 2604519, 2606195, 2605695, 2604520, 2606196, 2604521, 2604522, 2606197, 2604523, 2605696, 2605697, 2605698, 2606198, 2604524, 2604525, 2604526, 2604300, 2604527, 2606199, 2604528, 2604529, 2604301, 2606200, 2604302, 2606410, 2606201, 2606411, 2606202, 2606413, 2606203, 2606414, 2604303, 2604304, 2606204, 2604305, 2606206, 2606207, 2604306, 2606415, 2606208, 2606209, 2606416] into nyc-mr1-volantis-releaseandroid-7.1.1_r58android-7.1.1_r53nougat-mr1-volantis-releasenougat-mr1-flounder-release
Change-Id: I282210f707be39af84d38dfc7fbea635a07a9bf6
-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 24c6c54ed..aaf9a7510 100644
--- a/libvpx/vp9/common/vp9_alloccommon.c
+++ b/libvpx/vp9/common/vp9_alloccommon.c
@@ -164,6 +164,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;
}