diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-01 14:50:32 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-01 14:50:32 -0700 |
| commit | 2381d4648066c55b8d0460db0f5937ee37fcd63d (patch) | |
| tree | da5d296e9a6eeb8e73d9343e5d608d20b19277c9 /vp9/decoder/vp9_decodframe.c | |
| parent | 7bb436feee9eab8564299c8fe7a8b0eac16c9328 (diff) | |
| parent | 15fefced7d8f061fe9129c74951f3fe42a57b3e2 (diff) | |
| download | libvpx-2381d4648066c55b8d0460db0f5937ee37fcd63d.tar libvpx-2381d4648066c55b8d0460db0f5937ee37fcd63d.tar.gz libvpx-2381d4648066c55b8d0460db0f5937ee37fcd63d.tar.bz2 libvpx-2381d4648066c55b8d0460db0f5937ee37fcd63d.zip | |
Merge "Cleanup inside vp9_decodemv.c."
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index eac925bb5..5238658d0 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -294,7 +294,7 @@ static void decode_modes_b(VP9D_COMP *pbi, int mi_row, int mi_col, return; set_offsets(pbi, bsize, mi_row, mi_col); - vp9_decode_mb_mode_mv(pbi, xd, mi_row, mi_col, r); + vp9_read_mode_info(pbi, mi_row, mi_col, r); if (xd->mode_info_context->mbmi.ref_frame[0] == INTRA_FRAME) { decode_sb_intra(pbi, mi_row, mi_col, r, @@ -1047,7 +1047,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { set_prev_mi(pc); - vp9_decode_mode_mvs_init(pbi, &header_bc); + vp9_prepare_read_mode_info(pbi, &header_bc); decode_tiles(pbi, data, first_partition_size, &residual_bc); |