virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Use designated initialisers for pcm codec struct

Browse Source 
Originally committed as revision 24264 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2010-07-16 13:02:48 +00:00
parent 6441d39d58
commit a5b588bcad
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/pcm.c
View File

@ -444,16 +444,14 @@ static int pcm_decode_frame(AVCodecContext *avctx,
} }
#if CONFIG_ENCODERS #if CONFIG_ENCODERS
#define PCM_ENCODER(id,sample_fmt_,name,long_name_) \ #define PCM_ENCODER(id_,sample_fmt_,name_,long_name_) \
AVCodec name ## _encoder = { \ AVCodec name_ ## _encoder = { \
#name, \ .name = #name_, \
AVMEDIA_TYPE_AUDIO, \ .type = AVMEDIA_TYPE_AUDIO, \
id, \ .id = id_, \
0, \ .init = pcm_encode_init, \
pcm_encode_init, \ .encode = pcm_encode_frame, \
pcm_encode_frame, \ .close = pcm_encode_close, \
pcm_encode_close, \
NULL, \
.sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
}; };
@ -462,16 +460,14 @@ AVCodec name ## _encoder = { \
#endif #endif
#if CONFIG_DECODERS #if CONFIG_DECODERS
#define PCM_DECODER(id,sample_fmt_,name,long_name_) \ #define PCM_DECODER(id_,sample_fmt_,name_,long_name_) \
AVCodec name ## _decoder = { \ AVCodec name_ ## _decoder = { \
#name, \ .name = #name_, \
AVMEDIA_TYPE_AUDIO, \ .type = AVMEDIA_TYPE_AUDIO, \
id, \ .id = id_, \
sizeof(PCMDecode), \ .priv_data_size = sizeof(PCMDecode), \
pcm_decode_init, \ .init = pcm_decode_init, \
NULL, \ .decode = pcm_decode_frame, \
NULL, \
pcm_decode_frame, \
.sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
}; };