summaryrefslogtreecommitdiff
path: root/libavcodec/bintext.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2011-12-30 20:00:53 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-30 20:00:53 +0100
commitba10207bbe5ebd97b5afc3f19baf4a1ad8f974d5 (patch)
treec5602a20dc46f1f6dc9e555d0d1b1926a17cf210 /libavcodec/bintext.c
parent73ba2c1e62a870c7d7b27cd8093ef39447a57903 (diff)
downloadffmpeg-ba10207bbe5ebd97b5afc3f19baf4a1ad8f974d5.tar.gz
Use more designated initializers.
Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard.
Diffstat (limited to 'libavcodec/bintext.c')
-rw-r--r--libavcodec/bintext.c51
1 files changed, 24 insertions, 27 deletions
diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index df37feea12..0b46dd444e 100644
--- a/libavcodec/bintext.c
+++ b/libavcodec/bintext.c
@@ -211,40 +211,37 @@ static av_cold int decode_end(AVCodecContext *avctx)
}
AVCodec ff_bintext_decoder = {
- "bintext",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_BINTEXT,
- sizeof(XbinContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame,
- CODEC_CAP_DR1,
+ .name = "bintext",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_BINTEXT,
+ .priv_data_size = sizeof(XbinContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Binary text"),
};
AVCodec ff_xbin_decoder = {
- "xbin",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_XBIN,
- sizeof(XbinContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame,
- CODEC_CAP_DR1,
+ .name = "xbin",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_XBIN,
+ .priv_data_size = sizeof(XbinContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
};
AVCodec ff_idf_decoder = {
- "idf",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_IDF,
- sizeof(XbinContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame,
- CODEC_CAP_DR1,
+ .name = "idf",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_IDF,
+ .priv_data_size = sizeof(XbinContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
};