Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavformat / argo_asf.c

diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 39a60a0..5f38b68 100644 (file)
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -25,6 +25,7 @@
 #include "libavutil/avstring.h"
 #include "avformat.h"
 #include "internal.h"
+#include "mux.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
@@ -470,20 +471,20 @@ static const AVClass argo_asf_muxer_class = {
     .version    = LIBAVUTIL_VERSION_INT
 };
 
-const AVOutputFormat ff_argo_asf_muxer = {
-    .name           = "argo_asf",
-    .long_name      = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"),
+const FFOutputFormat ff_argo_asf_muxer = {
+    .p.name         = "argo_asf",
+    .p.long_name    = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"),
     /*
      * NB: Can't do this as it conflicts with the actual ASF format.
-     * .extensions  = "asf",
+     * .p.extensions  = "asf",
      */
-    .audio_codec    = AV_CODEC_ID_ADPCM_ARGO,
-    .video_codec    = AV_CODEC_ID_NONE,
+    .p.audio_codec  = AV_CODEC_ID_ADPCM_ARGO,
+    .p.video_codec  = AV_CODEC_ID_NONE,
+    .p.priv_class   = &argo_asf_muxer_class,
     .init           = argo_asf_write_init,
     .write_header   = argo_asf_write_header,
     .write_packet   = argo_asf_write_packet,
     .write_trailer  = argo_asf_write_trailer,
-    .priv_class     = &argo_asf_muxer_class,
     .priv_data_size = sizeof(ArgoASFMuxContext)
 };
 #endif