summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2013-06-08 07:14:58 -0700
committerDeb Mukherjee <debargha@google.com>2013-06-08 07:14:58 -0700
commit67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7 (patch)
tree027a21d2d937c2076a9c271dc17254b905249143 /vp9/common
parentb0003e497264ee14c1360a4e6b7a103b69728ea2 (diff)
downloadlibvpx-67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7.tar
libvpx-67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7.tar.gz
libvpx-67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7.tar.bz2
libvpx-67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7.zip
Minor fix in TX_SIZE contexts
Change-Id: I9e81f84877e18ba7e55d66389ed60e64a5b7abcc
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_pred_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c
index 16ba53e2f..f7c9f2c26 100644
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -359,18 +359,18 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm,
max_tx_size = TX_16X16;
else
max_tx_size = TX_32X32;
- if (xd->up_available) {
+ if (above_in_image) {
above_context = (above_mi->mbmi.mb_skip_coeff ?
max_tx_size : above_mi->mbmi.txfm_size);
}
- if (xd->left_available) {
+ if (left_in_image) {
left_context = (left_mi->mbmi.mb_skip_coeff ?
max_tx_size : left_mi->mbmi.txfm_size);
}
- if (!xd->left_available) {
+ if (!left_in_image) {
left_context = above_context;
}
- if (!xd->up_available) {
+ if (!above_in_image) {
above_context = left_context;
}
pred_context = (above_context + left_context + 1) >> 1;