diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-30 12:05:09 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-30 12:05:09 -0800 |
| commit | 6f954c7b5c60c765bbe10ad01d81beaaa9c81151 (patch) | |
| tree | ce3f0fa4e83a3d22fce0cc8e8d4fc71b822d635a /vp9/encoder | |
| parent | 46f02da7470171406ea033aa65202ce59bc83dd4 (diff) | |
| parent | 5ebed3e8610988bda027b59552dd8776c1dff8e2 (diff) | |
| download | libvpx-6f954c7b5c60c765bbe10ad01d81beaaa9c81151.tar libvpx-6f954c7b5c60c765bbe10ad01d81beaaa9c81151.tar.gz libvpx-6f954c7b5c60c765bbe10ad01d81beaaa9c81151.tar.bz2 libvpx-6f954c7b5c60c765bbe10ad01d81beaaa9c81151.zip | |
Merge "Replace inline with INLINE"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b97fd0293..dbbd4e339 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2480,10 +2480,10 @@ static void set_mode_info(MB_MODE_INFO *mbmi, BLOCK_SIZE bsize, mbmi->sb_type = bsize; mbmi->segment_id = 0; } -static inline int get_block_row(int b32i, int b16i, int b8i) { +static INLINE int get_block_row(int b32i, int b16i, int b8i) { return ((b32i >> 1) << 2) + ((b16i >> 1) << 1) + (b8i >> 1); } -static inline int get_block_col(int b32i, int b16i, int b8i) { +static INLINE int get_block_col(int b32i, int b16i, int b8i) { return ((b32i & 1) << 2) + ((b16i & 1) << 1) + (b8i & 1); } static void rtc_use_partition(VP9_COMP *cpi, |