diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-26 11:33:16 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-08-26 11:33:16 -0700 |
| commit | 45870619f3d2f97e179ea58acc886f22cc37ebfb (patch) | |
| tree | 53af23344964cb48c0d1a3893b3e0f63e9d8085f /vp9/common/vp9_entropy.h | |
| parent | 5eed6e222468afe2a478be60c10d0f7b894d3863 (diff) | |
| download | libvpx-45870619f3d2f97e179ea58acc886f22cc37ebfb.tar libvpx-45870619f3d2f97e179ea58acc886f22cc37ebfb.tar.gz libvpx-45870619f3d2f97e179ea58acc886f22cc37ebfb.tar.bz2 libvpx-45870619f3d2f97e179ea58acc886f22cc37ebfb.zip | |
Renaming BLOCK_SIZE_TYPE to BLOCK_SIZE in the common/decoder.
Adding temporary "typedef BLOCK_SIZE BLOCK_SIZE_TYPE" which will go away
after encoder's patch.
Change-Id: I06ec6a6f079401439843ec981d1496234fd7775c
Diffstat (limited to 'vp9/common/vp9_entropy.h')
| -rw-r--r-- | vp9/common/vp9_entropy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 82cbfd32c..2552056ed 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -156,11 +156,11 @@ extern DECLARE_ALIGNED(16, int16_t, void vp9_coef_tree_initialize(void); void vp9_adapt_coef_probs(struct VP9Common *); -static INLINE void reset_skip_context(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize) { +static INLINE void reset_skip_context(MACROBLOCKD *xd, BLOCK_SIZE bsize) { int i; for (i = 0; i < MAX_MB_PLANE; i++) { struct macroblockd_plane *const pd = &xd->plane[i]; - const BLOCK_SIZE_TYPE plane_bsize = get_plane_block_size(bsize, pd); + const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd); vpx_memset(pd->above_context, 0, sizeof(ENTROPY_CONTEXT) * num_4x4_blocks_wide_lookup[plane_bsize]); vpx_memset(pd->left_context, 0, sizeof(ENTROPY_CONTEXT) * |