Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / g722.c

diff --git a/libavcodec/g722.c b/libavcodec/g722.c
index e8e74242b82e3091a255e60b38fc9aa62ad9de76..2c04c40b56e448c7289da224953f9771ab72ce1c 100644 (file)
--- a/libavcodec/g722.c
+++ b/libavcodec/g722.c
@@ -129,7 +129,7 @@ static void do_adaptive_prediction(struct G722Band *band, const int cur_diff)
     band->prev_qtzd_reconst = cur_qtzd_reconst;
 }
 
-static int inline linear_scale_factor(const int log_factor)
+static inline int linear_scale_factor(const int log_factor)
 {
     const int wd1 = inv_log2_table[(log_factor >> 6) & 31];
     const int shift = log_factor >> 11;