ref: ce896df057ed3eb39c8be13c69ce964a926fc980
parent: 3a924f6ed1c997e41c1f500151d58542ec91f277
parent: 9c74e6aac7e87228b71915be2687962d7c48d331
author: James Zern <[email protected]>
date: Fri Aug 1 15:15:34 EDT 2014
Merge "vp9_entropy: inline comes first to avoid warning."
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -188,7 +188,7 @@
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];