Merge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'

[ffmpeg] / libavcodec / aacenc_quantization.h

diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aacenc_quantization.h
index 425040748c393c6f8fa17a01f466417cc7c5c7a7..fc5a46b8754ac861db6d886ec8059f77c1893aee 100644 (file)
--- a/libavcodec/aacenc_quantization.h
+++ b/libavcodec/aacenc_quantization.h
@@ -74,10 +74,10 @@ static av_always_inline float quantize_and_encode_band_cost_template(
         return cost * lambda;
     }
     if (!scaled) {
-        abs_pow34_v(s->scoefs, in, size);
+        s->abs_pow34(s->scoefs, in, size);
         scaled = s->scoefs;
     }
-    quantize_bands(s->qcoefs, in, scaled, size, Q34, !BT_UNSIGNED, aac_cb_maxval[cb], ROUNDING);
+    s->quant_bands(s->qcoefs, in, scaled, size, !BT_UNSIGNED, aac_cb_maxval[cb], Q34, ROUNDING);
     if (BT_UNSIGNED) {
         off = 0;
     } else {