commit 5d942744eff8899dbdfbf2117a54f2b8a87b181b
author Vignesh Venkatasubramanian <vigneshv@google.com> Fri Jan 06 18:07:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 18:07:30 2017 +0000
tree 00600826f981928fc8a74e6f41e1cbf2be08fcb2
parent 2accfd7a27a29e150bcbc548999524ffdb48912b
parent be649c294f41bc2205b9363ea45f2f3b4f721710

libvpx: Cherry-pick 1961a92 from upstream am: 57e9ae1497 am: 90b12e62bf am: 8202db16f8
am: be649c294f

Change-Id: I81464619f37c48e98804b0c43b0d77b63e3641ae

libvpx/vp9/decoder/vp9_decodeframe.c

diff --git a/libvpx/vp9/decoder/vp9_decodeframe.c b/libvpx/vp9/decoder/vp9_decodeframe.c
index f191663..d0ba631 100644
--- a/libvpx/vp9/decoder/vp9_decodeframe.c
+++ b/libvpx/vp9/decoder/vp9_decodeframe.c
@@ -1585,7 +1585,6 @@
     return 0;
   }
 
-  tile_data->xd.error_info = &tile_data->error_info;
   tile_data->xd.corrupted = 0;
 
   do {
@@ -1597,6 +1596,8 @@
                         &tile_data->error_info, &tile_data->bit_reader,
                         pbi->decrypt_cb, pbi->decrypt_state);
     vp9_init_macroblockd(&pbi->common, &tile_data->xd, tile_data->dqcoeff);
+    // init resets xd.error_info
+    tile_data->xd.error_info = &tile_data->error_info;
 
     for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end;
          mi_row += MI_BLOCK_SIZE) {