summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-06-10 15:17:55 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-06-13 16:49:35 -0400
commit38c304addd978410956c8ff02ea83a6ffb9a606a (patch)
tree4a62dd8249c6b84fff8ead0e5b5db0b066adfd72
parente0cc66df61664bb6f9271d9aae3c778e1f906b4c (diff)
ac3enc: remove empty ac3_float function that is never called
-rw-r--r--libavcodec/ac3enc.c1
-rw-r--r--libavcodec/ac3enc.h1
-rw-r--r--libavcodec/ac3enc_float.c10
3 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 1147ed142e..78e81654e3 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -2363,7 +2363,6 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
s->mdct_end = ff_ac3_float_mdct_end;
s->mdct_init = ff_ac3_float_mdct_init;
s->apply_window = ff_ac3_float_apply_window;
- s->normalize_samples = ff_ac3_float_normalize_samples;
s->scale_coefficients = ff_ac3_float_scale_coefficients;
s->deinterleave_input_samples = ff_ac3_float_deinterleave_input_samples;
s->apply_mdct = ff_ac3_float_apply_mdct;
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h
index e9d7e0a83a..1d17484321 100644
--- a/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@ -269,7 +269,6 @@ void ff_ac3_float_apply_window(DSPContext *dsp, SampleType *output,
const SampleType *window, unsigned int len);
int ff_ac3_fixed_normalize_samples(AC3EncodeContext *s);
-int ff_ac3_float_normalize_samples(AC3EncodeContext *s);
void ff_ac3_fixed_scale_coefficients(AC3EncodeContext *s);
void ff_ac3_float_scale_coefficients(AC3EncodeContext *s);
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index 9c7e88ed1c..43fbb954d6 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -91,16 +91,6 @@ void ff_ac3_float_apply_window(DSPContext *dsp, float *output,
/**
- * Normalize the input samples to use the maximum available precision.
- */
-int ff_ac3_float_normalize_samples(AC3EncodeContext *s)
-{
- /* Normalization is not needed for floating-point samples, so just return 0 */
- return 0;
-}
-
-
-/**
* Scale MDCT coefficients from float to 24-bit fixed-point.
*/
void ff_ac3_float_scale_coefficients(AC3EncodeContext *s)