diff options
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/ac3enc_fixed.c | 2 | ||||
-rw-r--r-- | libavcodec/ac3enc_float.c | 10 | ||||
-rw-r--r-- | libavcodec/ac3enc_template.c | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 9d39026..f10c3b5 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -43,6 +43,8 @@ static const AVClass ac3enc_class = { .version = LIBAVUTIL_VERSION_INT, }; +static int normalize_samples(AC3EncodeContext *s); + #include "ac3enc_template.c" diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index caa210d..79839df 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -87,16 +87,6 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s) /* - * Normalize the input samples. - * Not needed for the floating-point encoder. - */ -static int normalize_samples(AC3EncodeContext *s) -{ - return 0; -} - - -/* * Scale MDCT coefficients from float to 24-bit fixed-point. */ static void scale_coefficients(AC3EncodeContext *s) diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 9dec9ae..0b23b96 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -40,8 +40,6 @@ static void scale_coefficients(AC3EncodeContext *s); -static int normalize_samples(AC3EncodeContext *s); - static void clip_coefficients(AudioDSPContext *adsp, CoefType *coef, unsigned int len); @@ -113,10 +111,10 @@ static void apply_mdct(AC3EncodeContext *s) #else s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, s->mdct_window, AC3_WINDOW_SIZE); -#endif if (s->fixed_point) block->coeff_shift[ch+1] = normalize_samples(s); +#endif s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1], s->windowed_samples); |