summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_blockd.h
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2013-07-16 16:58:37 +0100
committerPaul Wilkins <paulwilkins@google.com>2013-07-16 18:27:33 +0100
commit30d2ea45ce12a937e6ed015b5576a9fe8e47c945 (patch)
tree59161b6d31320f5dd521d5338de29195bd812061 /vp9/common/vp9_blockd.h
parente8e7620a1f9330bc4e70de24f02d6f4e87cbf68f (diff)
downloadlibvpx-30d2ea45ce12a937e6ed015b5576a9fe8e47c945.tar
libvpx-30d2ea45ce12a937e6ed015b5576a9fe8e47c945.tar.gz
libvpx-30d2ea45ce12a937e6ed015b5576a9fe8e47c945.tar.bz2
libvpx-30d2ea45ce12a937e6ed015b5576a9fe8e47c945.zip
Minor cleanup in code to fine uv tx_size.
Change-Id: I94b97a966b5efbc9a243048f1f5ddbbdc4b1846e
Diffstat (limited to 'vp9/common/vp9_blockd.h')
-rw-r--r--vp9/common/vp9_blockd.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 2ca9898c5..ca2e1ea82 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -392,9 +392,7 @@ static void setup_block_dptrs(MACROBLOCKD *xd, int ss_x, int ss_y) {
static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi) {
- const TX_SIZE size = mbmi->txfm_size;
- const TX_SIZE max_size = max_uv_txsize_lookup[mbmi->sb_type];
- return (size > max_size ? max_size : size);
+ return MIN(mbmi->txfm_size, max_uv_txsize_lookup[mbmi->sb_type]);
}
struct plane_block_idx {