Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

[ffmpeg] / libavcodec / celp_math.c

diff --git a/libavcodec/celp_math.c b/libavcodec/celp_math.c
index 56dc86379eb6d630592073873e237924fafdb52b..a96b1aed9ea19bad77b817d5ab4ff02beb3e77c3 100644 (file)
--- a/libavcodec/celp_math.c
+++ b/libavcodec/celp_math.c
@@ -75,7 +75,7 @@ static const uint16_t tab_log2[33] =
 #endif
 };
 
-int ff_log2(uint32_t value)
+int ff_log2_q15(uint32_t value)
 {
     uint8_t  power_int;
     uint8_t  frac_x0;