diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
index 05f68d3cdc71fb36d70bf800ec6bc0a8bd13c550..8eae0212135ef43ad91ac42ffc781b822731d4e0 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@@ -164,13 +164,12 @@ static const AVClass alsa_demuxer_class = {
};
AVInputFormat ff_alsa_demuxer = {
- "alsa",
- NULL_IF_CONFIG_SMALL("ALSA audio input"),
- sizeof(AlsaData),
- NULL,
- audio_read_header,
- audio_read_packet,
- ff_alsa_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &alsa_demuxer_class,
+ .name = "alsa",
+ .long_name = NULL_IF_CONFIG_SMALL("ALSA audio input"),
+ .priv_data_size = sizeof(AlsaData),
+ .read_header = audio_read_header,
+ .read_packet = audio_read_packet,
+ .read_close = ff_alsa_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &alsa_demuxer_class,
};
diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c
index f3782c5ab6728d6611a3b0f31a36c189d2c8f26c..95887c19ed79b3d18d67ff986096b8f7bd4037be 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa-audio-enc.c
@@ -102,15 +102,13 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
}
AVOutputFormat ff_alsa_muxer = {
- "alsa",
- NULL_IF_CONFIG_SMALL("ALSA audio output"),
- "",
- "",
- sizeof(AlsaData),
- DEFAULT_CODEC_ID,
- CODEC_ID_NONE,
- audio_write_header,
- audio_write_packet,
- ff_alsa_close,
- .flags = AVFMT_NOFILE,
+ .name = "alsa",
+ .long_name = NULL_IF_CONFIG_SMALL("ALSA audio output"),
+ .priv_data_size = sizeof(AlsaData),
+ .audio_codec = DEFAULT_CODEC_ID,
+ .video_codec = CODEC_ID_NONE,
+ .write_header = audio_write_header,
+ .write_packet = audio_write_packet,
+ .write_trailer = ff_alsa_close,
+ .flags = AVFMT_NOFILE,
};
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 7ff46cf8a34f20c5a0894ba63826ee9b29c915d4..f03cf2f192e36830df44ea1a56d4ef0a328982e1 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -345,13 +345,12 @@ static const AVClass bktr_class = {
};
AVInputFormat ff_bktr_demuxer = {
- "bktr",
- NULL_IF_CONFIG_SMALL("video grab"),
- sizeof(VideoData),
- NULL,
- grab_read_header,
- grab_read_packet,
- grab_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &bktr_class,
+ .name = "bktr",
+ .long_name = NULL_IF_CONFIG_SMALL("video grab"),
+ .priv_data_size = sizeof(VideoData),
+ .read_header = grab_read_header,
+ .read_packet = grab_read_packet,
+ .read_close = grab_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &bktr_class,
};
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index 029ace6dc05e4fcdda7f47a81948d925d4019edb..c59a22d113f46e4bc81df09a96e230ce7eefec16 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -326,13 +326,12 @@ static const AVClass jack_indev_class = {
};
AVInputFormat ff_jack_demuxer = {
- "jack",
- NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"),
- sizeof(JackData),
- NULL,
- audio_read_header,
- audio_read_packet,
- audio_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &jack_indev_class,
+ .name = "jack",
+ .long_name = NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"),
+ .priv_data_size = sizeof(JackData),
+ .read_header = audio_read_header,
+ .read_packet = audio_read_packet,
+ .read_close = audio_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &jack_indev_class,
};
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 6df7f34d7ee09ee49561c4eec088b67e91712926..c19c67784d19953b5f285c2ad7fbffab36250c52 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -295,33 +295,30 @@ static const AVClass oss_demuxer_class = {
};
AVInputFormat ff_oss_demuxer = {
- "oss",
- NULL_IF_CONFIG_SMALL("Open Sound System capture"),
- sizeof(AudioData),
- NULL,
- audio_read_header,
- audio_read_packet,
- audio_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &oss_demuxer_class,
+ .name = "oss",
+ .long_name = NULL_IF_CONFIG_SMALL("Open Sound System capture"),
+ .priv_data_size = sizeof(AudioData),
+ .read_header = audio_read_header,
+ .read_packet = audio_read_packet,
+ .read_close = audio_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &oss_demuxer_class,
};
#endif
#if CONFIG_OSS_OUTDEV
AVOutputFormat ff_oss_muxer = {
- "oss",
- NULL_IF_CONFIG_SMALL("Open Sound System playback"),
- "",
- "",
- sizeof(AudioData),
+ .name = "oss",
+ .long_name = NULL_IF_CONFIG_SMALL("Open Sound System playback"),
+ .priv_data_size = sizeof(AudioData),
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
- AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
- CODEC_ID_NONE,
- audio_write_header,
- audio_write_packet,
- audio_write_trailer,
- .flags = AVFMT_NOFILE,
+ .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
+ .video_codec = CODEC_ID_NONE,
+ .write_header = audio_write_header,
+ .write_packet = audio_write_packet,
+ .write_trailer = audio_write_trailer,
+ .flags = AVFMT_NOFILE,
};
#endif
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index b0f0452d8e2fb9814cc1d44c90a6025c631d5db5..5c1caf858ab767627a7db009bb7779d70000b841 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -354,14 +354,13 @@ static const AVClass v4l_class = {
};
AVInputFormat ff_v4l_demuxer = {
- "video4linux",
- NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
- sizeof(VideoData),
- NULL,
- grab_read_header,
- grab_read_packet,
- grab_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &v4l_class,
+ .name = "video4linux",
+ .long_name = NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
+ .priv_data_size = sizeof(VideoData),
+ .read_header = grab_read_header,
+ .read_packet = grab_read_packet,
+ .read_close = grab_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &v4l_class,
};
#endif /* FF_API_V4L */
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 7a501a901ce92bca7361114324942e49a8c14a01..2ae5a3fe17cb8ffddce9123cba52254b83096b83 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -725,13 +725,12 @@ static const AVClass v4l2_class = {
};
AVInputFormat ff_v4l2_demuxer = {
- "video4linux2",
- NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
- sizeof(struct video_data),
- NULL,
- v4l2_read_header,
- v4l2_read_packet,
- v4l2_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &v4l2_class,
+ .name = "video4linux2",
+ .long_name = NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
+ .priv_data_size = sizeof(struct video_data),
+ .read_header = v4l2_read_header,
+ .read_packet = v4l2_read_packet,
+ .read_close = v4l2_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &v4l2_class,
};
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 47a9ebeb9c82bea40e4899e2c9ef0e943a69d082..4faf2d937d055e2018fc1528528428da2701abca 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -470,13 +470,12 @@ static const AVClass vfw_class = {
};
AVInputFormat ff_vfwcap_demuxer = {
- "vfwcap",
- NULL_IF_CONFIG_SMALL("VFW video capture"),
- sizeof(struct vfw_ctx),
- NULL,
- vfw_read_header,
- vfw_read_packet,
- vfw_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &vfw_class,
+ .name = "vfwcap",
+ .long_name = NULL_IF_CONFIG_SMALL("VfW video capture"),
+ .priv_data_size = sizeof(struct vfw_ctx),
+ .read_header = vfw_read_header,
+ .read_packet = vfw_read_packet,
+ .read_close = vfw_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &vfw_class,
};
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 5cc32dc20dfa0d6bdec9c30e49794161431c0b36..1a8a9963ed5ea8c7774b79e0604bd75184d100d3 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -598,15 +598,13 @@ static const AVClass x11_class = {
};
/** x11 grabber device demuxer declaration */
-AVInputFormat ff_x11_grab_device_demuxer =
-{
- "x11grab",
- NULL_IF_CONFIG_SMALL("X11grab"),
- sizeof(struct x11_grab),
- NULL,
- x11grab_read_header,
- x11grab_read_packet,
- x11grab_read_close,
- .flags = AVFMT_NOFILE,
- .priv_class = &x11_class,
+AVInputFormat ff_x11_grab_device_demuxer = {
+ .name = "x11grab",
+ .long_name = NULL_IF_CONFIG_SMALL("X11grab"),
+ .priv_data_size = sizeof(struct x11_grab),
+ .read_header = x11grab_read_header,
+ .read_packet = x11grab_read_packet,
+ .read_close = x11grab_read_close,
+ .flags = AVFMT_NOFILE,
+ .priv_class = &x11_class,
};
diff --git a/libavformat/daud.c b/libavformat/daud.c
index 9421d18a3b482622967b37c7ad2fcff8b324057d..6a48818c84172950f4518d7c0c5029f6d848dfc1 100644
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -80,17 +80,14 @@ AVInputFormat ff_daud_demuxer = {
#endif
#if CONFIG_DAUD_MUXER
-AVOutputFormat ff_daud_muxer =
-{
- "daud",
- NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
- NULL,
- "302",
- 0,
- CODEC_ID_PCM_S24DAUD,
- CODEC_ID_NONE,
- daud_write_header,
- daud_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
+AVOutputFormat ff_daud_muxer = {
+ .name = "daud",
+ .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
+ .extensions = "302",
+ .audio_codec = CODEC_ID_PCM_S24DAUD,
+ .video_codec = CODEC_ID_NONE,
+ .write_header = daud_write_header,
+ .write_packet = daud_write_packet,
+ .flags = AVFMT_NOTIMESTAMPS,
};
#endif
diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index 688d58d1ab815b0147eac0c3506d65fe2e6ca258..266a731cc3f2643f4245cf3cb0d09663b0f945e4 100644
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -35,15 +35,12 @@ static int roq_write_header(struct AVFormatContext *s)
return 0;
}
-AVOutputFormat ff_roq_muxer =
-{
- "RoQ",
- NULL_IF_CONFIG_SMALL("raw id RoQ format"),
- NULL,
- "roq",
- 0,
- CODEC_ID_ROQ_DPCM,
- CODEC_ID_ROQ,
- roq_write_header,
- ff_raw_write_packet,
+AVOutputFormat ff_roq_muxer = {
+ .name = "RoQ",
+ .long_name = NULL_IF_CONFIG_SMALL("raw id RoQ format"),
+ .extensions = "roq",
+ .audio_codec = CODEC_ID_ROQ_DPCM,
+ .video_codec = CODEC_ID_ROQ,
+ .write_header = roq_write_header,
+ .write_packet = ff_raw_write_packet,
};
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 90799dd664b461ee571a4363a5c044fe8f7873e1..22023320b8295f0ed30e994ea19b4e5cfa6117d0 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -54,26 +54,24 @@ static const AVOption pcm_options[] = {
{ NULL },
};
-#define PCMDEF(name, long_name, ext, codec) \
-static const AVClass name ## _demuxer_class = {\
- .class_name = #name " demuxer",\
- .item_name = av_default_item_name,\
- .option = pcm_options,\
- .version = LIBAVUTIL_VERSION_INT,\
-};\
-AVInputFormat ff_pcm_ ## name ## _demuxer = {\
- #name,\
- NULL_IF_CONFIG_SMALL(long_name),\
- sizeof(RawAudioDemuxerContext),\
- NULL,\
- ff_raw_read_header,\
- raw_read_packet,\
- NULL,\
- pcm_read_seek,\
- .flags= AVFMT_GENERIC_INDEX,\
- .extensions = ext,\
- .value = codec,\
- .priv_class = &name ## _demuxer_class,\
+#define PCMDEF(name_, long_name_, ext, codec) \
+static const AVClass name_ ## _demuxer_class = { \
+ .class_name = #name_ " demuxer", \
+ .item_name = av_default_item_name, \
+ .option = pcm_options, \
+ .version = LIBAVUTIL_VERSION_INT, \
+}; \
+AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
+ .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
+ .priv_data_size = sizeof(RawAudioDemuxerContext), \
+ .read_header = ff_raw_read_header, \
+ .read_packet = raw_read_packet, \
+ .read_seek = pcm_read_seek, \
+ .flags = AVFMT_GENERIC_INDEX, \
+ .extensions = ext, \
+ .value = codec, \
+ .priv_class = &name_ ## _demuxer_class, \
};
PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c
index 928124e9b03f6afa704b01d4ee92e1b78ba8cf86..553df1f877a4ff5c2c340a1b46624f22564e1ec5 100644
--- a/libavformat/pcmenc.c
+++ b/libavformat/pcmenc.c
@@ -22,18 +22,15 @@
#include "avformat.h"
#include "rawenc.h"
-#define PCMDEF(name, long_name, ext, codec) \
-AVOutputFormat ff_pcm_ ## name ## _muxer = {\
- #name,\
- NULL_IF_CONFIG_SMALL(long_name),\
- NULL,\
- ext,\
- 0,\
- codec,\
- CODEC_ID_NONE,\
- NULL,\
- ff_raw_write_packet,\
- .flags= AVFMT_NOTIMESTAMPS,\
+#define PCMDEF(name_, long_name_, ext, codec) \
+AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \
+ .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
+ .extensions = ext, \
+ .audio_codec = codec, \
+ .video_codec = CODEC_ID_NONE, \
+ .write_packet = ff_raw_write_packet, \
+ .flags = AVFMT_NOTIMESTAMPS, \
};
PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
diff --git a/libavformat/txd.c b/libavformat/txd.c
index 0a93b7c76090d485e54b0d72aa9a7001a3de0e79..e6fae08aa02fb5b82efd9421915ad4419de65c2f 100644
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -90,12 +90,10 @@ next_chunk:
return 0;
}
-AVInputFormat ff_txd_demuxer =
-{
- "txd",
- NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
- 0,
- txd_probe,
- txd_read_header,
- txd_read_packet,
+AVInputFormat ff_txd_demuxer = {
+ .name = "txd",
+ .long_name = NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
+ .read_probe = txd_probe,
+ .read_header = txd_read_header,
+ .read_packet = txd_read_packet,
};