diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:39:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:46:08 +0200 |
commit | faba79e0800ded6285e2cf75622fa42077e781f4 (patch) | |
tree | cc57a187242b52fcde696caf65571b411ab5d392 /libavcodec/ac3enc_float.c | |
parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
download | ffmpeg-faba79e0800ded6285e2cf75622fa42077e781f4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_float.c')
-rw-r--r-- | libavcodec/ac3enc_float.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index cb75314164..8845518fe0 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -121,14 +121,13 @@ static void clip_coefficients(DSPContext *dsp, float *coef, unsigned int len) #if CONFIG_AC3_ENCODER AVCodec ff_ac3_float_encoder = { - "ac3_float", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_AC3, - sizeof(AC3EncodeContext), - ff_ac3_encode_init, - ff_ac3_float_encode_frame, - ff_ac3_encode_close, - NULL, + .name = "ac3 float", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_AC3, + .priv_data_size = sizeof(AC3EncodeContext), + .init = ff_ac3_encode_init, + .encode = ff_ac3_float_encode_frame, + .close = ff_ac3_encode_close, .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, |