lavf: use designated initialisers for all (de)muxers.

It's more readable and less prone to breakage.

1 files changed, 110 insertions, 153 deletions

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 00e43df9a7..5f2065e639 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -34,195 +34,163 @@ int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
 
 #if CONFIG_AC3_MUXER
 AVOutputFormat ff_ac3_muxer = {
-    "ac3",
-    NULL_IF_CONFIG_SMALL("raw AC-3"),
-    "audio/x-ac3",
-    "ac3",
-    0,
-    CODEC_ID_AC3,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "ac3",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw AC-3"),
+    .mime_type         = "audio/x-ac3",
+    .extensions        = "ac3",
+    .audio_codec       = CODEC_ID_AC3,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_DIRAC_MUXER
 AVOutputFormat ff_dirac_muxer = {
-    "dirac",
-    NULL_IF_CONFIG_SMALL("raw Dirac"),
-    NULL,
-    "drc",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_DIRAC,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "dirac",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw Dirac"),
+    .extensions        = "drc",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_DIRAC,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_DNXHD_MUXER
 AVOutputFormat ff_dnxhd_muxer = {
-    "dnxhd",
-    NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
-    NULL,
-    "dnxhd",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_DNXHD,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "dnxhd",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
+    .extensions        = "dnxhd",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_DNXHD,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_DTS_MUXER
 AVOutputFormat ff_dts_muxer = {
-    "dts",
-    NULL_IF_CONFIG_SMALL("raw DTS"),
-    "audio/x-dca",
-    "dts",
-    0,
-    CODEC_ID_DTS,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "dts",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw DTS"),
+    .mime_type         = "audio/x-dca",
+    .extensions        = "dts",
+    .audio_codec       = CODEC_ID_DTS,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_EAC3_MUXER
 AVOutputFormat ff_eac3_muxer = {
-    "eac3",
-    NULL_IF_CONFIG_SMALL("raw E-AC-3"),
-    "audio/x-eac3",
-    "eac3",
-    0,
-    CODEC_ID_EAC3,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "eac3",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw E-AC-3"),
+    .mime_type         = "audio/x-eac3",
+    .extensions        = "eac3",
+    .audio_codec       = CODEC_ID_EAC3,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_G722_MUXER
 AVOutputFormat ff_g722_muxer = {
-    "g722",
-    NULL_IF_CONFIG_SMALL("raw G.722"),
-    "audio/G722",
-    "g722",
-    0,
-    CODEC_ID_ADPCM_G722,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "g722",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw G.722"),
+    .mime_type         = "audio/G722",
+    .extensions        = "g722",
+    .audio_codec       = CODEC_ID_ADPCM_G722,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_H261_MUXER
 AVOutputFormat ff_h261_muxer = {
-    "h261",
-    NULL_IF_CONFIG_SMALL("raw H.261"),
-    "video/x-h261",
-    "h261",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_H261,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "h261",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw H.261"),
+    .mime_type         = "video/x-h261",
+    .extensions        = "h261",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_H261,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_H263_MUXER
 AVOutputFormat ff_h263_muxer = {
-    "h263",
-    NULL_IF_CONFIG_SMALL("raw H.263"),
-    "video/x-h263",
-    "h263",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_H263,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "h263",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw H.263"),
+    .mime_type         = "video/x-h263",
+    .extensions        = "h263",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_H263,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_H264_MUXER
 AVOutputFormat ff_h264_muxer = {
-    "h264",
-    NULL_IF_CONFIG_SMALL("raw H.264 video format"),
-    NULL,
-    "h264",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_H264,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "h264",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw H.264 video format"),
+    .extensions        = "h264",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_H264,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_CAVSVIDEO_MUXER
 AVOutputFormat ff_cavsvideo_muxer = {
-    "cavsvideo",
-    NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
-    NULL,
-    "cavs",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_CAVS,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "cavsvideo",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
+    .extensions        = "cavs",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_CAVS,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_M4V_MUXER
 AVOutputFormat ff_m4v_muxer = {
-    "m4v",
-    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
-    NULL,
-    "m4v",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_MPEG4,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "m4v",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
+    .extensions        = "m4v",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_MPEG4,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_MJPEG_MUXER
 AVOutputFormat ff_mjpeg_muxer = {
-    "mjpeg",
-    NULL_IF_CONFIG_SMALL("raw MJPEG video"),
-    "video/x-mjpeg",
-    "mjpg,mjpeg",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_MJPEG,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "mjpeg",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw MJPEG video"),
+    .mime_type         = "video/x-mjpeg",
+    .extensions        = "mjpg,mjpeg",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_MJPEG,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_MLP_MUXER
 AVOutputFormat ff_mlp_muxer = {
-    "mlp",
-    NULL_IF_CONFIG_SMALL("raw MLP"),
-    NULL,
-    "mlp",
-    0,
-    CODEC_ID_MLP,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "mlp",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw MLP"),
+    .extensions        = "mlp",
+    .audio_codec       = CODEC_ID_MLP,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
@@ -241,60 +209,49 @@ AVOutputFormat ff_srt_muxer = {
 
 #if CONFIG_TRUEHD_MUXER
 AVOutputFormat ff_truehd_muxer = {
-    "truehd",
-    NULL_IF_CONFIG_SMALL("raw TrueHD"),
-    NULL,
-    "thd",
-    0,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_NONE,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "truehd",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw TrueHD"),
+    .extensions        = "thd",
+    .audio_codec       = CODEC_ID_TRUEHD,
+    .video_codec       = CODEC_ID_NONE,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_MPEG1VIDEO_MUXER
 AVOutputFormat ff_mpeg1video_muxer = {
-    "mpeg1video",
-    NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
-    "video/x-mpeg",
-    "mpg,mpeg,m1v",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_MPEG1VIDEO,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "mpeg1video",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
+    .mime_type         = "video/x-mpeg",
+    .extensions        = "mpg,mpeg,m1v",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_MPEG1VIDEO,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_MPEG2VIDEO_MUXER
 AVOutputFormat ff_mpeg2video_muxer = {
-    "mpeg2video",
-    NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
-    NULL,
-    "m2v",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_MPEG2VIDEO,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "mpeg2video",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
+    .extensions        = "m2v",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_MPEG2VIDEO,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif
 
 #if CONFIG_RAWVIDEO_MUXER
 AVOutputFormat ff_rawvideo_muxer = {
-    "rawvideo",
-    NULL_IF_CONFIG_SMALL("raw video format"),
-    NULL,
-    "yuv,rgb",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_RAWVIDEO,
-    NULL,
-    ff_raw_write_packet,
+    .name              = "rawvideo",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw video format"),
+    .extensions        = "yuv,rgb",
+    .audio_codec       = CODEC_ID_NONE,
+    .video_codec       = CODEC_ID_RAWVIDEO,
+    .write_packet      = ff_raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
 #endif