summaryrefslogtreecommitdiff
path: root/libavcodec/ac3enc_float.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-16 23:20:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-16 23:24:10 +0200
commit1aeb88b77ddbd3802127a61bf8610e55b6c49a6f (patch)
tree784f8679e8f6a5ca5a7980e20e8b3b5fff47cbd4 /libavcodec/ac3enc_float.c
parentbdf3d3bf9dce398acce608de77da205e08bdace3 (diff)
downloadffmpeg-1aeb88b77ddbd3802127a61bf8610e55b6c49a6f.tar.gz
Correctly implement ac3 float/fixed encoder.
There is no need to have 2 encoders, the input sample format can,does and should choose which is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_float.c')
-rw-r--r--libavcodec/ac3enc_float.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index d89880535e..1a145e5ab2 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -98,8 +98,8 @@ static void scale_coefficients(AC3EncodeContext *s)
}
-AVCodec ff_ac3_encoder = {
- "ac3",
+AVCodec ff_ac3_float_encoder = {
+ "ac3_float",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_AC3,
sizeof(AC3EncodeContext),
@@ -110,5 +110,5 @@ AVCodec ff_ac3_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
.priv_class = &ac3enc_class,
- .channel_layouts = ac3_channel_layouts,
+ .channel_layouts = ff_ac3_channel_layouts,
};