summaryrefslogtreecommitdiff
path: root/libavcodec/ac3enc_template.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-01-04 11:50:22 +0100
committerDiego Biurrun <diego@biurrun.de>2016-11-28 17:19:30 +0100
commite22c63ac74b2968075be8bf0d2deb1ee63b28976 (patch)
tree10743fd3afce80643c354e7f7db0bfe7e81bdf71 /libavcodec/ac3enc_template.c
parentd30719e62de68975cbc7ffd318df03a183037563 (diff)
downloadffmpeg-e22c63ac74b2968075be8bf0d2deb1ee63b28976.tar.gz
ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function
Diffstat (limited to 'libavcodec/ac3enc_template.c')
-rw-r--r--libavcodec/ac3enc_template.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index ec8ec4ef6a..eefcef5b01 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);
@@ -110,10 +108,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);