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

ce896df0 · James Zern · Gerrit Code Review · 3a924f6e · 9c74e6aa · ce896df0
Commit ce896df0 authored Aug 01, 2014 by James Zern Committed by Gerrit Code Review Aug 01, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/common/vp9_entropy.h vp9/common/vp9_entropy.h +1 -1

No files found.
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -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];