Merge "Make inlines static" am: e338b979f9 -s ours

am: 9c99a1cf3c  -s ours

Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2

diff --git a/audio_utils/channels.c b/audio_utils/channels.c
index 538deba..91d18fd 100644 (file)
--- a/audio_utils/channels.c
+++ b/audio_utils/channels.c
@@ -32,7 +32,7 @@ static inline int32_t clamp24(int32_t sample)
 /*
  * Converts a uint8x3_t into an int32_t
  */
-inline int32_t uint8x3_to_int32(uint8x3_t val) {
+static inline int32_t uint8x3_to_int32(uint8x3_t val) {
 #if HAVE_BIG_ENDIAN
     int32_t temp = (val.c[0] << 24 | val.c[1] << 16 | val.c[2] << 8) >> 8;
 #else
@@ -44,7 +44,7 @@ inline int32_t uint8x3_to_int32(uint8x3_t val) {
 /*
  * Converts an int32_t to a uint8x3_t
  */
-inline uint8x3_t int32_to_uint8x3(int32_t in) {
+static inline uint8x3_t int32_to_uint8x3(int32_t in) {
     uint8x3_t out;
 #if HAVE_BIG_ENDIAN
     out.c[2] = in;