diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-24 10:45:32 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-24 10:45:32 -0700 |
commit | bd994ed42d3adde54b05fab0ddf94e46e84f16e0 (patch) | |
tree | 6e07b61f6f28a72be550b11a79393c5202665eb5 /vp9/common | |
parent | 6579720e6aa9e568bd876d2592d52831de1bf7b3 (diff) | |
download | libvpx-bd994ed42d3adde54b05fab0ddf94e46e84f16e0.tar libvpx-bd994ed42d3adde54b05fab0ddf94e46e84f16e0.tar.gz libvpx-bd994ed42d3adde54b05fab0ddf94e46e84f16e0.tar.bz2 libvpx-bd994ed42d3adde54b05fab0ddf94e46e84f16e0.zip |
Fixing PRED_SWITCHABLE_INTERP case in vp9_get_pred_context function.
Adding xd->up_available as additional check for above context.
Change-Id: If5654e4cae184b9c369b7b2e08076cb2951d00ed
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_pred_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index 6376bcd5a..c12920c4d 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -66,7 +66,7 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm, VP9_SWITCHABLE_FILTERS; // above - const int above_in_image = above_mi->mbmi.mb_in_image; + const int above_in_image = xd->up_available && above_mi->mbmi.mb_in_image; const int above_mv_pred = above_mi->mbmi.mode >= NEARESTMV && above_mi->mbmi.mode <= SPLITMV; const int above_interp = above_in_image && above_mv_pred ? |