@@ -368,7 +368,7 @@ struct AACContext {
INTFLOAT *in, IndividualChannelStream *ics);
void (*update_ltp)(AACContext *ac, SingleChannelElement *sce);
void (*vector_pow43)(int *coefs, int len);
- void (*subband_scale)(int *dst, int *src, int scale, int offset, int len);
+ void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
};
@@ -162,7 +162,7 @@ static void vector_pow43(int *coefs, int len)
}
}
-static void subband_scale(int *dst, int *src, int scale, int offset, int len)
+static void subband_scale(int *dst, int *src, int scale, int offset, int len, void *log_context)
{
int ssign = scale < 0 ? -1 : 1;
int s = FFABS(scale);
@@ -189,7 +189,7 @@ static void subband_scale(int *dst, int *src, int scale, int offset, int len)
dst[i] = out * (unsigned)ssign;
}
} else {
- av_log(NULL, AV_LOG_ERROR, "Overflow in subband_scale()\n");
+ av_log(log_context, AV_LOG_ERROR, "Overflow in subband_scale()\n");
}
}
@@ -1927,7 +1927,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, INTFLOAT coef[1024],
if (cbt_m1 < NOISE_BT - 1) {
for (group = 0; group < (int)g_len; group++, cfo+=128) {
ac->vector_pow43(cfo, off_len);
- ac->subband_scale(cfo, cfo, sf[idx], 34, off_len);
+ ac->subband_scale(cfo, cfo, sf[idx], 34, off_len, ac->avctx);
}
}
}
@@ -2158,7 +2158,7 @@ static void apply_intensity_stereo(AACContext *ac,
coef0 + group * 128 + offsets[i],
scale,
23,
- offsets[i + 1] - offsets[i]);
+ offsets[i + 1] - offsets[i] ,ac->avctx);
#else
ac->fdsp->vector_fmul_scalar(coef1 + group * 128 + offsets[i],
coef0 + group * 128 + offsets[i],
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/aac.h | 2 +- libavcodec/aacdec_fixed.c | 4 ++-- libavcodec/aacdec_template.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)