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/libmp3lame.c | |
| parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
| parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
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/libmp3lame.c')
| -rw-r--r-- | libavcodec/libmp3lame.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 05893830c1..349363eda1 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -269,13 +269,13 @@ static av_cold int MP3lame_encode_close(AVCodecContext *avctx) AVCodec ff_libmp3lame_encoder = { - "libmp3lame", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_MP3, - sizeof(Mp3AudioContext), - MP3lame_encode_init, - MP3lame_encode_frame, - MP3lame_encode_close, + .name = "libmp3lame", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_MP3, + .priv_data_size = sizeof(Mp3AudioContext), + .init = MP3lame_encode_init, + .encode = MP3lame_encode_frame, + .close = MP3lame_encode_close, .capabilities= CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, #if 2147483647 == INT_MAX |