Merge commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa'

[ffmpeg] / libavcodec / aaccoder_trellis.h

diff --git a/libavcodec/aaccoder_trellis.h b/libavcodec/aaccoder_trellis.h
index 0230052809ef5b84b5f416c98c41b8b26ed1235c..940ebf029ddda2deeeb3dfda982197a7af62c3b8 100644 (file)
--- a/libavcodec/aaccoder_trellis.h
+++ b/libavcodec/aaccoder_trellis.h
@@ -70,7 +70,7 @@ static void codebook_trellis_rate(AACEncContext *s, SingleChannelElement *sce,
     float next_minbits = INFINITY;
     int next_mincb = 0;
 
-    abs_pow34_v(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
     start = win*128;
     for (cb = 0; cb < CB_TOT_ALL; cb++) {
         path[0][cb].cost     = run_bits+4;