Merge remote-tracking branch 'cus/stable'

[ffmpeg] / libavformat / wtvenc.c

diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c
index d638dcb2056e34087a55f139f2444d93f252f820..b5718339202de55331639d0febcfb621e5e03785 100644 (file)
--- a/libavformat/wtvenc.c
+++ b/libavformat/wtvenc.c
@@ -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 },
 };