summaryrefslogtreecommitdiff
path: root/libavcodec/g726.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-07-17 12:54:31 +0200
committerAnton Khirnov <anton@khirnov.net>2011-07-29 08:42:34 +0200
commitec6402b7c595c3ceed6d1b8c1b75c6aa8336e052 (patch)
treeb0ac16ae01c2bb355766ae164a1b44fc88617750 /libavcodec/g726.c
parent3ad168412600e16dfaa4b41b21322a82a8535990 (diff)
lavc: use designated initialisers for all codecs.
It's more readable and less prone to breakage.
Diffstat (limited to 'libavcodec/g726.c')
-rw-r--r--libavcodec/g726.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 09df727c0f..0f8fe81fc3 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -392,14 +392,13 @@ static int g726_decode_frame(AVCodecContext *avctx,
#if CONFIG_ADPCM_G726_ENCODER
AVCodec ff_adpcm_g726_encoder = {
- "g726",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_ADPCM_G726,
- sizeof(G726Context),
- g726_init,
- g726_encode_frame,
- g726_close,
- NULL,
+ .name = "g726",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_ADPCM_G726,
+ .priv_data_size = sizeof(G726Context),
+ .init = g726_init,
+ .encode = g726_encode_frame,
+ .close = g726_close,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
@@ -407,13 +406,12 @@ AVCodec ff_adpcm_g726_encoder = {
#endif
AVCodec ff_adpcm_g726_decoder = {
- "g726",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_ADPCM_G726,
- sizeof(G726Context),
- g726_init,
- NULL,
- g726_close,
- g726_decode_frame,
+ .name = "g726",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_ADPCM_G726,
+ .priv_data_size = sizeof(G726Context),
+ .init = g726_init,
+ .close = g726_close,
+ .decode = g726_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
};