Merge "inline->INLINE: vpx_dsp/x86/blend_a64_vmask_sse4.c" into nextgenv2

2016-07-25 20:48:52 +00:00 · 2016-07-25 20:48:52 +00:00 · 230c24caaf
--- a/vpx_dsp/x86/blend_a64_mask_sse4.c
+++ b/vpx_dsp/x86/blend_a64_mask_sse4.c
@ -559,7 +559,7 @@ static void blend_a64_mask_b12_w4_sse4_1(
                              blend_4_b12);
 }

-static inline void blend_a64_mask_bn_w8n_sse4_1(
+static INLINE void blend_a64_mask_bn_w8n_sse4_1(
    uint16_t *dst, uint32_t dst_stride,
    const uint16_t *src0, uint32_t src0_stride,
    const uint16_t *src1, uint32_t src1_stride,
--- a/vpx_dsp/x86/blend_a64_vmask_sse4.c
+++ b/vpx_dsp/x86/blend_a64_vmask_sse4.c
@ -196,7 +196,7 @@ static void blend_a64_vmask_b12_w4_sse4_1(
                               blend_4_b12);
 }

-static inline void blend_a64_vmask_bn_w8n_sse4_1(
+static INLINE void blend_a64_vmask_bn_w8n_sse4_1(
    uint16_t *dst, uint32_t dst_stride,
    const uint16_t *src0, uint32_t src0_stride,
    const uint16_t *src1, uint32_t src1_stride,