Merge "vp9_entropy: inline comes first to avoid warning."

This commit is contained in:
James Zern
2014-08-01 19:15:34 -07:00
committed by Gerrit Code Review

View File

@@ -188,7 +188,7 @@ static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
return combine_entropy_contexts(above_ec, left_ec);
}
static const INLINE scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size,
static INLINE const scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size,
PLANE_TYPE type, int block_idx) {
const MODE_INFO *const mi = xd->mi[0];