diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 22:37:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 22:39:52 +0200 |
| commit | eae3cf06a5410cf6d06235de4ceea28e33e53be3 (patch) | |
| tree | 126512350cc96249cd1d157969a87a0018f6ab53 /libavformat/daud.c | |
| parent | 0f2297a9b958b8598b17f139e7ec2d7e593a0a7c (diff) | |
| parent | 2b4e49d4281690db67073ba644ad2ffc17767cdf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvdec: Fix invalid pointer deferences when parsing index
configure: disable hardware capabilities ELF section with suncc on Solaris x86
Use explicit struct initializers for AVCodec declarations.
Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
adpcmenc: Set bits_per_coded_sample
adpcmenc: fix QT IMA ADPCM encoder
adpcmdec: Fix QT IMA ADPCM decoder
permit decoding of multichannel ADPCM_EA_XAS
Fix input buffer size check in adpcm_ea decoder.
fft: avoid a signed overflow
mpegps: Handle buffer exhaustion when reading packets.
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavdevice/alsa-audio-enc.c
libavformat/flvdec.c
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/daud.c')
| -rw-r--r-- | libavformat/daud.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libavformat/daud.c b/libavformat/daud.c index 66a20c347f..34262e010c 100644 --- a/libavformat/daud.c +++ b/libavformat/daud.c @@ -80,17 +80,14 @@ AVInputFormat ff_daud_demuxer = { #endif #if CONFIG_DAUD_MUXER -AVOutputFormat ff_daud_muxer = -{ - "daud", - NULL_IF_CONFIG_SMALL("D-Cinema audio format"), - NULL, - "302", - 0, - CODEC_ID_PCM_S24DAUD, - CODEC_ID_NONE, - daud_write_header, - daud_write_packet, - .flags= AVFMT_NOTIMESTAMPS, +AVOutputFormat ff_daud_muxer = { + .name = "daud", + .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"), + .extensions = "302", + .audio_codec = CODEC_ID_PCM_S24DAUD, + .video_codec = CODEC_ID_NONE, + .write_header = daud_write_header, + .write_packet = daud_write_packet, + .flags = AVFMT_NOTIMESTAMPS, }; #endif |