diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-09 20:44:30 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-09 20:44:30 -0700 |
| commit | 65e650e0c0b030ce3cab880ef5b189e337a689ac (patch) | |
| tree | 13860d55652438e5a7ec244f914f92d611183bc7 /vp9/decoder | |
| parent | 3dff8aa36bc8a60f70dbcd88eeaff29fd8360052 (diff) | |
| parent | 60def47f21767ee690e5a5472314914b3bb0e546 (diff) | |
| download | libvpx-65e650e0c0b030ce3cab880ef5b189e337a689ac.tar libvpx-65e650e0c0b030ce3cab880ef5b189e337a689ac.tar.gz libvpx-65e650e0c0b030ce3cab880ef5b189e337a689ac.tar.bz2 libvpx-65e650e0c0b030ce3cab880ef5b189e337a689ac.zip | |
Merge "Revert "Converting set_prev_mi() to get_prev_mi().""
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 9b63961f0..022a4296f 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1296,7 +1296,11 @@ int vp9_decode_frame(VP9Decoder *pbi, } init_macroblockd(cm, &pbi->mb); - cm->prev_mi = get_prev_mi(cm); + + if (cm->coding_use_prev_mi) + set_prev_mi(cm); + else + cm->prev_mi = NULL; setup_plane_dequants(cm, xd, cm->base_qindex); vp9_setup_block_planes(xd, cm->subsampling_x, cm->subsampling_y); |