diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2017-01-06 18:07:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-06 18:07:30 +0000 |
| commit | 5d942744eff8899dbdfbf2117a54f2b8a87b181b (patch) | |
| tree | 00600826f981928fc8a74e6f41e1cbf2be08fcb2 | |
| parent | 2accfd7a27a29e150bcbc548999524ffdb48912b (diff) | |
| parent | be649c294f41bc2205b9363ea45f2f3b4f721710 (diff) | |
| download | libvpx-5d942744eff8899dbdfbf2117a54f2b8a87b181b.tar.gz | |
libvpx: Cherry-pick 1961a92 from upstream am: 57e9ae1497 am: 90b12e62bf am: 8202db16f8android-n-mr2-preview-2android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r3android-7.1.2_r2android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2-dev
am: be649c294f
Change-Id: I81464619f37c48e98804b0c43b0d77b63e3641ae
| -rw-r--r-- | libvpx/vp9/decoder/vp9_decodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/vp9/decoder/vp9_decodeframe.c b/libvpx/vp9/decoder/vp9_decodeframe.c index f1916639b..d0ba63136 100644 --- a/libvpx/vp9/decoder/vp9_decodeframe.c +++ b/libvpx/vp9/decoder/vp9_decodeframe.c @@ -1585,7 +1585,6 @@ static int tile_worker_hook(TileWorkerData *const tile_data, return 0; } - tile_data->xd.error_info = &tile_data->error_info; tile_data->xd.corrupted = 0; do { @@ -1597,6 +1596,8 @@ static int tile_worker_hook(TileWorkerData *const tile_data, &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) { |