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 /libavcodec/dpcm.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 'libavcodec/dpcm.c')
| -rw-r--r-- | libavcodec/dpcm.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index ee8eb6a722..d9c15246e9 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -298,17 +298,15 @@ static int dpcm_decode_frame(AVCodecContext *avctx, return buf_size; } -#define DPCM_DECODER(id, name, long_name_) \ -AVCodec ff_ ## name ## _decoder = { \ - #name, \ - AVMEDIA_TYPE_AUDIO, \ - id, \ - sizeof(DPCMContext), \ - dpcm_decode_init, \ - NULL, \ - NULL, \ - dpcm_decode_frame, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ +#define DPCM_DECODER(id_, name_, long_name_) \ +AVCodec ff_ ## name_ ## _decoder = { \ + .name = #name_, \ + .type = AVMEDIA_TYPE_AUDIO, \ + .id = id_, \ + .priv_data_size = sizeof(DPCMContext), \ + .init = dpcm_decode_init, \ + .decode = dpcm_decode_frame, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); |