diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-16 22:18:12 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-17 06:58:37 +0200 |
| commit | dfc2c4d900e48fa788ad9364ac408c01cfb62b94 (patch) | |
| tree | eafdab4d3a81a427ddf30862f88af6a650eeaef0 /libavformat/rawdec.c | |
| parent | 62709956677d648cbf340dccd4549fa62142cb7e (diff) | |
lavf: use designated initialisers for all (de)muxers.
It's more readable and less prone to breakage.
Diffstat (limited to 'libavformat/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index cc05c353e9..8f3fecb1e7 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -217,12 +217,11 @@ const AVClass ff_rawvideo_demuxer_class = { #if CONFIG_G722_DEMUXER AVInputFormat ff_g722_demuxer = { - "g722", - NULL_IF_CONFIG_SMALL("raw G.722"), - sizeof(RawAudioDemuxerContext), - NULL, - ff_raw_read_header, - ff_raw_read_partial_packet, + .name = "g722", + .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), + .priv_data_size = sizeof(RawAudioDemuxerContext), + .read_header = ff_raw_read_header, + .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "g722,722", .value = CODEC_ID_ADPCM_G722, @@ -232,12 +231,10 @@ AVInputFormat ff_g722_demuxer = { #if CONFIG_GSM_DEMUXER AVInputFormat ff_gsm_demuxer = { - "gsm", - NULL_IF_CONFIG_SMALL("raw GSM"), - 0, - NULL, - ff_raw_audio_read_header, - ff_raw_read_partial_packet, + .name = "gsm", + .long_name = NULL_IF_CONFIG_SMALL("raw GSM"), + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "gsm", .value = CODEC_ID_GSM, @@ -250,12 +247,10 @@ FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", CODEC_ID_M #if CONFIG_MLP_DEMUXER AVInputFormat ff_mlp_demuxer = { - "mlp", - NULL_IF_CONFIG_SMALL("raw MLP"), - 0, - NULL, - ff_raw_audio_read_header, - ff_raw_read_partial_packet, + .name = "mlp", + .long_name = NULL_IF_CONFIG_SMALL("raw MLP"), + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "mlp", .value = CODEC_ID_MLP, @@ -264,12 +259,10 @@ AVInputFormat ff_mlp_demuxer = { #if CONFIG_TRUEHD_DEMUXER AVInputFormat ff_truehd_demuxer = { - "truehd", - NULL_IF_CONFIG_SMALL("raw TrueHD"), - 0, - NULL, - ff_raw_audio_read_header, - ff_raw_read_partial_packet, + .name = "truehd", + .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "thd", .value = CODEC_ID_TRUEHD, @@ -278,12 +271,10 @@ AVInputFormat ff_truehd_demuxer = { #if CONFIG_SHORTEN_DEMUXER AVInputFormat ff_shorten_demuxer = { - "shn", - NULL_IF_CONFIG_SMALL("raw Shorten"), - 0, - NULL, - ff_raw_audio_read_header, - ff_raw_read_partial_packet, + .name = "shn", + .long_name = NULL_IF_CONFIG_SMALL("raw Shorten"), + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "shn", .value = CODEC_ID_SHORTEN, |