diff options
| author | Hui Su <huisu@google.com> | 2015-08-12 19:49:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 19:49:48 +0000 |
| commit | 17cf545edb1a4d5a986f4934c7bfc39c17c59ed0 (patch) | |
| tree | 2e59cc98c7bfb88eb43ae8db472e18024973c1dc /vp10/encoder | |
| parent | 54fb24aac324871054ecbb8bc8e526361b094be2 (diff) | |
| parent | cb79ea1c16a210306e7d400bfea2e89d667f611b (diff) | |
| download | libvpx-17cf545edb1a4d5a986f4934c7bfc39c17c59ed0.tar libvpx-17cf545edb1a4d5a986f4934c7bfc39c17c59ed0.tar.gz libvpx-17cf545edb1a4d5a986f4934c7bfc39c17c59ed0.tar.bz2 libvpx-17cf545edb1a4d5a986f4934c7bfc39c17c59ed0.zip | |
Merge "Call set_ref_ptrs only for inter blocks"
Diffstat (limited to 'vp10/encoder')
| -rw-r--r-- | vp10/encoder/encodeframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index 4968cc152..262bd34a8 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -4155,8 +4155,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, if (x->skip_encode) return; - set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); - if (!is_inter_block(mbmi)) { int plane; mbmi->skip = 1; @@ -4168,6 +4166,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, } else { int ref; const int is_compound = has_second_ref(mbmi); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); for (ref = 0; ref < 1 + is_compound; ++ref) { YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi, mbmi->ref_frame[ref]); |