Commit ee4a34c2 authored by Angie Chiang's avatar Angie Chiang
Browse files

Fix conflict between lv_map and cb4x4

Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e
parent d61e608d
...@@ -184,7 +184,12 @@ void av1_write_coeffs_mb(const AV1_COMMON *const cm, MACROBLOCK *x, ...@@ -184,7 +184,12 @@ void av1_write_coeffs_mb(const AV1_COMMON *const cm, MACROBLOCK *x,
struct macroblockd_plane *pd = &xd->plane[plane]; struct macroblockd_plane *pd = &xd->plane[plane];
#if CONFIG_CB4X4 #if CONFIG_CB4X4
#if CONFIG_CHROMA_2X2
const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd); const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
#else
const BLOCK_SIZE plane_bsize =
AOMMAX(BLOCK_4X4, get_plane_block_size(bsize, pd));
#endif // CONFIG_CHROMA_2X2
#else #else
const BLOCK_SIZE plane_bsize = const BLOCK_SIZE plane_bsize =
get_plane_block_size(AOMMAX(bsize, BLOCK_8X8), pd); get_plane_block_size(AOMMAX(bsize, BLOCK_8X8), pd);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment