diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-11 21:26:59 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-11 21:26:59 -0700 |
| commit | 490c5fe0745f70a57812ce9e74fca86de7e60f16 (patch) | |
| tree | 95eb44f93b93eb86f91af919aff2901d5c51640d /vp9 | |
| parent | 16efb549391489175a4962779929963e48610eac (diff) | |
| parent | 1f58f9d09217d35d0d0901fe49965ef2014a53ce (diff) | |
| download | libvpx-490c5fe0745f70a57812ce9e74fca86de7e60f16.tar libvpx-490c5fe0745f70a57812ce9e74fca86de7e60f16.tar.gz libvpx-490c5fe0745f70a57812ce9e74fca86de7e60f16.tar.bz2 libvpx-490c5fe0745f70a57812ce9e74fca86de7e60f16.zip | |
Merge "Fixing error found by ioc."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index d498f4c7f..1bf8621e7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3910,10 +3910,11 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, // TODO(jingning, jkoleszar): scaling reference frame not supported for // sub8x8 blocks. - if (ref_frame > NONE && vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf)) + if (ref_frame > INTRA_FRAME && + vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf)) continue; - if (second_ref_frame > NONE && + if (second_ref_frame > INTRA_FRAME && vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf)) continue; |