diff options
Diffstat (limited to 'libavcodec/gsmdec.c')
| -rw-r--r-- | libavcodec/gsmdec.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 693febd673..a3f67d3b52 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -2,20 +2,20 @@ * gsm 06.10 decoder * Copyright (c) 2010 Reimar Döffinger <Reimar.Doeffinger@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -85,25 +85,21 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, } AVCodec ff_gsm_decoder = { - "gsm", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM, - sizeof(GSMContext), - gsm_init, - NULL, - NULL, - gsm_decode_frame, + .name = "gsm", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM, + .priv_data_size = sizeof(GSMContext), + .init = gsm_init, + .decode = gsm_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("GSM"), }; AVCodec ff_gsm_ms_decoder = { - "gsm_ms", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_GSM_MS, - sizeof(GSMContext), - gsm_init, - NULL, - NULL, - gsm_decode_frame, + .name = "gsm_ms", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_GSM_MS, + .priv_data_size = sizeof(GSMContext), + .init = gsm_init, + .decode = gsm_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), }; |