MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

act, bintext, wtvenc: use named struct initializers

Browse Source
This commit is contained in:
Aurelien Jacobs 2011-09-26 00:19:56 +02:00
parent f85c9b7771
commit c894449fc4
3 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/act.c
View File

@ -198,10 +198,10 @@ static int read_packet(AVFormatContext *s,
}
AVInputFormat ff_act_demuxer = {
"act",
"ACT Voice file format",
sizeof(ACTContext),
probe,
read_header,
read_packet
.name = "act",
.long_name = "ACT Voice file format",
.priv_data_size = sizeof(ACTContext),
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,
};

52
libavformat/bintext.c
View File

@ -330,47 +330,45 @@ static int read_packet(AVFormatContext *s,
#if CONFIG_BINTEXT_DEMUXER
AVInputFormat ff_bintext_demuxer = {
"bin",
NULL_IF_CONFIG_SMALL("Binary text"),
sizeof(BinDemuxContext),
NULL,
bintext_read_header,
read_packet,
.extensions = "bin",
.name = "bin",
.long_name = NULL_IF_CONFIG_SMALL("Binary text"),
.priv_data_size = sizeof(BinDemuxContext),
.read_header = bintext_read_header,
.read_packet = read_packet,
.extensions = "bin",
};
#endif
#if CONFIG_XBIN_DEMUXER
AVInputFormat ff_xbin_demuxer = {
"xbin",
NULL_IF_CONFIG_SMALL("eXtended BINary text (XBIN)"),
sizeof(BinDemuxContext),
xbin_probe,
xbin_read_header,
read_packet,
.name = "xbin",
.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text (XBIN)"),
.priv_data_size = sizeof(BinDemuxContext),
.read_probe = xbin_probe,
.read_header = xbin_read_header,
.read_packet = read_packet,
};
#endif
#if CONFIG_ADF_DEMUXER
AVInputFormat ff_adf_demuxer = {
"adf",
NULL_IF_CONFIG_SMALL("Artworx Data Format"),
sizeof(BinDemuxContext),
NULL,
adf_read_header,
read_packet,
.extensions = "adf",
.name = "adf",
.long_name = NULL_IF_CONFIG_SMALL("Artworx Data Format"),
.priv_data_size = sizeof(BinDemuxContext),
.read_header = adf_read_header,
.read_packet = read_packet,
.extensions = "adf",
};
#endif
#if CONFIG_IDF_DEMUXER
AVInputFormat ff_idf_demuxer = {
"idf",
NULL_IF_CONFIG_SMALL("iCE Draw File"),
sizeof(BinDemuxContext),
idf_probe,
idf_read_header,
read_packet,
.extensions = "idf",
.name = "idf",
.long_name = NULL_IF_CONFIG_SMALL("iCE Draw File"),
.priv_data_size = sizeof(BinDemuxContext),
.read_probe = idf_probe,
.read_header = idf_read_header,
.read_packet = read_packet,
.extensions = "idf",
};
#endif

22
libavformat/wtvenc.c
View File

@ -708,15 +708,15 @@ static int write_trailer(AVFormatContext *s)
}
AVOutputFormat ff_wtv_muxer = {
"wtv",
NULL_IF_CONFIG_SMALL("Windows Television (WTV)"),
NULL,
"wtv",
sizeof(WtvContext),
CODEC_ID_MP2,
CODEC_ID_MPEG2VIDEO,
write_header,
write_packet,
write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.name = "wtv",
.long_name = NULL_IF_CONFIG_SMALL("Windows Television (WTV)"),
.extensions = "wtv",
.priv_data_size = sizeof(WtvContext),
.audio_codec = CODEC_ID_MP2,
.video_codec = CODEC_ID_MPEG2VIDEO,
.write_header = write_header,
.write_packet = write_packet,
.write_trailer = write_trailer,
.codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags,
ff_codec_wav_tags, 0 },
};