diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2016-08-19 09:09:11 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 16:02:20 -0800 |
| commit | ec8be27a90eae58b3e6186174e57492bfc9513e6 (patch) | |
| tree | 8e925445e84720214de3cf43ced220e7bd304a1a | |
| parent | 177c6da5559b95b4bed9698e159a5406437710a8 (diff) | |
| download | android_external_libvpx-stable/cm-13.0-ZNH0E.tar.gz android_external_libvpx-stable/cm-13.0-ZNH0E.tar.bz2 android_external_libvpx-stable/cm-13.0-ZNH0E.zip | |
DO NOT MERGE libvpx: Cherry-pick 8b4c315 from upstreamstable/cm-13.0-ZNH0E
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
CYNGNOS-3303
Bug: 30593752
Change-Id: Iafbf1c4114062bf796f51a6b03be71328f7bcc69
(cherry picked from commit 737c8493693243838128788fe9c3abc51f17338e)
(cherry picked from commit 3e88ffac8c80b76e15286ef8a7b3bd8fa246c761)
| -rw-r--r-- | libvpx/vp9/common/vp9_alloccommon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libvpx/vp9/common/vp9_alloccommon.c b/libvpx/vp9/common/vp9_alloccommon.c index ac417b6..ed337a0 100644 --- a/libvpx/vp9/common/vp9_alloccommon.c +++ b/libvpx/vp9/common/vp9_alloccommon.c @@ -152,6 +152,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; } |