diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2014-07-11 13:47:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-11 13:47:03 -0700 |
| commit | 7e340614c12204fd885a5fabf7047d8af7aa51d0 (patch) | |
| tree | 76c7c62d4bbc393f8e5ea26a91adaed28f7b9500 /vp9/common/vp9_blockd.h | |
| parent | 6298e232e168aba11e227ba9c0ec8e8dc3a190ae (diff) | |
| parent | 978642a426c86b4fbf85484eb8ee70f8f975d5b1 (diff) | |
| download | libvpx-7e340614c12204fd885a5fabf7047d8af7aa51d0.tar libvpx-7e340614c12204fd885a5fabf7047d8af7aa51d0.tar.gz libvpx-7e340614c12204fd885a5fabf7047d8af7aa51d0.tar.bz2 libvpx-7e340614c12204fd885a5fabf7047d8af7aa51d0.zip | |
Merge "Remove unnecessary assertions"
Diffstat (limited to 'vp9/common/vp9_blockd.h')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 9d5ad9cbd..29af98a59 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -242,9 +242,7 @@ typedef struct macroblockd { static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize, PARTITION_TYPE partition) { - const BLOCK_SIZE subsize = subsize_lookup[partition][bsize]; - assert(subsize < BLOCK_SIZES); - return subsize; + return subsize_lookup[partition][bsize]; } extern const TX_TYPE intra_mode_to_tx_type_lookup[INTRA_MODES]; @@ -288,9 +286,7 @@ static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi, static INLINE BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize, const struct macroblockd_plane *pd) { - BLOCK_SIZE bs = ss_size_lookup[bsize][pd->subsampling_x][pd->subsampling_y]; - assert(bs < BLOCK_SIZES); - return bs; + return ss_size_lookup[bsize][pd->subsampling_x][pd->subsampling_y]; } typedef void (*foreach_transformed_block_visitor)(int plane, int block, |