X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibgsm.c;h=92f1e98cdd1837e77e9e0326821ecd9ad61de677;hb=f1b5693027d48a9e448f21595fb9247893c225cf;hp=45cb256fcf026f4debc12a8d12d4b3deeb068591;hpb=2dd2abe391ccf1b9140c6eea95767b5a8c503ddd;p=ffmpeg diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 45cb256fcf0..92f1e98cdd1 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -113,25 +113,23 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVCodec ff_libgsm_encoder = { - "libgsm", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM, - 0, - libgsm_init, - libgsm_encode_frame, - libgsm_close, + .name = "libgsm", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM, + .init = libgsm_init, + .encode = libgsm_encode_frame, + .close = libgsm_close, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec ff_libgsm_ms_encoder = { - "libgsm_ms", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM_MS, - 0, - libgsm_init, - libgsm_encode_frame, - libgsm_close, + .name = "libgsm_ms", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM_MS, + .init = libgsm_init, + .encode = libgsm_encode_frame, + .close = libgsm_close, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), }; @@ -157,25 +155,21 @@ static int libgsm_decode_frame(AVCodecContext *avctx, } AVCodec ff_libgsm_decoder = { - "libgsm", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM, - 0, - libgsm_init, - NULL, - libgsm_close, - libgsm_decode_frame, + .name = "libgsm", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM, + .init = libgsm_init, + .close = libgsm_close, + .decode = libgsm_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec ff_libgsm_ms_decoder = { - "libgsm_ms", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM_MS, - 0, - libgsm_init, - NULL, - libgsm_close, - libgsm_decode_frame, + .name = "libgsm_ms", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM_MS, + .init = libgsm_init, + .close = libgsm_close, + .decode = libgsm_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), };