mp3enc: downgrade some errors in writing Xing frame to warnings

[ffmpeg] / libavcodec / sipr16k.c

diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c
index ca10cd9c70f16acea4caf0362ec0d49e9da42cd4..bff739e44f1711eb909020388b784936ab5fef25 100644 (file)
--- a/libavcodec/sipr16k.c
+++ b/libavcodec/sipr16k.c
@@ -24,9 +24,11 @@
 #include <math.h>
 
 #include "sipr.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
+#include "dsputil.h"
 #include "lsp.h"
-#include "celp_math.h"
+#include "celp_filters.h"
 #include "acelp_vectors.h"
 #include "acelp_pitch_delay.h"
 #include "acelp_filters.h"
@@ -162,10 +164,10 @@ static float acelp_decode_gain_codef(float gain_corr_factor, const float *fc_v,
                                      int subframe_size, int ma_pred_order)
 {
     mr_energy +=
-        ff_dot_productf(quant_energy, ma_prediction_coeff, ma_pred_order);
+        ff_scalarproduct_float_c(quant_energy, ma_prediction_coeff, ma_pred_order);
 
     mr_energy = gain_corr_factor * exp(M_LN10 / 20. * mr_energy) /
-        sqrt((0.01 + ff_dot_productf(fc_v, fc_v, subframe_size)));
+        sqrt((0.01 + ff_scalarproduct_float_c(fc_v, fc_v, subframe_size)));
     return mr_energy;
 }