ffmpeg | branch: master | Diego Biurrun <di...@biurrun.de> | Mon Jan 4 11:50:22 2016 +0100| [e22c63ac74b2968075be8bf0d2deb1ee63b28976] | committer: Diego Biurrun
ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e22c63ac74b2968075be8bf0d2deb1ee63b28976 --- libavcodec/ac3enc_fixed.c | 2 ++ libavcodec/ac3enc_float.c | 10 ---------- 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 2bb82ef..c26f9c0 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -38,6 +38,8 @@ static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name, ac3_options, 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 968cb2c..5bae4bc 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -83,16 +83,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 ec8ec4e..eefcef5 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
