Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / cafenc.c

diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index 0dd4b349ca4b4a3de95ce8adf26452a4d8ca512d..699c67df7a0c995582c33c0e96d43d8330fac6d8 100644 (file)
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
@@ -248,15 +248,15 @@ static int caf_write_trailer(AVFormatContext *s)
 }
 
 AVOutputFormat ff_caf_muxer = {
-    "caf",
-    NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
-    "audio/x-caf",
-    "caf",
-    sizeof(CAFContext),
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_NONE,
-    caf_write_header,
-    caf_write_packet,
-    caf_write_trailer,
+    .name           = "caf",
+    .long_name      = NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
+    .mime_type      = "audio/x-caf",
+    .extensions     = "caf",
+    .priv_data_size = sizeof(CAFContext),
+    .audio_codec    = CODEC_ID_PCM_S16BE,
+    .video_codec    = CODEC_ID_NONE,
+    .write_header   = caf_write_header,
+    .write_packet   = caf_write_packet,
+    .write_trailer  = caf_write_trailer,
     .codec_tag= (const AVCodecTag* const []){ff_codec_caf_tags, 0},
 };