# HG changeset patch # User pross # Date 1279285368 0 # Node ID 77b51328fc595a273e698c9d7035adedace55eb6 # Parent 6f0db2eeaf707bc371f6f384da47e8bf3968ad7c Use designated initialisers for pcm codec struct diff -r 6f0db2eeaf70 -r 77b51328fc59 pcm.c --- a/pcm.c Fri Jul 16 07:20:35 2010 +0000 +++ b/pcm.c Fri Jul 16 13:02:48 2010 +0000 @@ -444,16 +444,14 @@ } #if CONFIG_ENCODERS -#define PCM_ENCODER(id,sample_fmt_,name,long_name_) \ -AVCodec name ## _encoder = { \ - #name, \ - AVMEDIA_TYPE_AUDIO, \ - id, \ - 0, \ - pcm_encode_init, \ - pcm_encode_frame, \ - pcm_encode_close, \ - NULL, \ +#define PCM_ENCODER(id_,sample_fmt_,name_,long_name_) \ +AVCodec name_ ## _encoder = { \ + .name = #name_, \ + .type = AVMEDIA_TYPE_AUDIO, \ + .id = id_, \ + .init = pcm_encode_init, \ + .encode = pcm_encode_frame, \ + .close = pcm_encode_close, \ .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; @@ -462,16 +460,14 @@ #endif #if CONFIG_DECODERS -#define PCM_DECODER(id,sample_fmt_,name,long_name_) \ -AVCodec name ## _decoder = { \ - #name, \ - AVMEDIA_TYPE_AUDIO, \ - id, \ - sizeof(PCMDecode), \ - pcm_decode_init, \ - NULL, \ - NULL, \ - pcm_decode_frame, \ +#define PCM_DECODER(id_,sample_fmt_,name_,long_name_) \ +AVCodec name_ ## _decoder = { \ + .name = #name_, \ + .type = AVMEDIA_TYPE_AUDIO, \ + .id = id_, \ + .priv_data_size = sizeof(PCMDecode), \ + .init = pcm_decode_init, \ + .decode = pcm_decode_frame, \ .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ };