summaryrefslogtreecommitdiff
path: root/libavformat/au.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2023-01-27 15:06:00 +0100
committerAnton Khirnov <anton@khirnov.net>2023-02-09 15:24:15 +0100
commit59c9dc82f450638a3068deeb1db5c56f6d155752 (patch)
tree936dabca4a3e593553f6e0c8409e530111c99c0c /libavformat/au.c
parentf23ae839fc184c4492e10f371cde5c1b55e51522 (diff)
avformat/avformat: Move AVOutputFormat internals out of public header
This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/au.c')
-rw-r--r--libavformat/au.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/libavformat/au.c b/libavformat/au.c
index f7c47d5333..3bf2150258 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -33,6 +33,7 @@
#include "avformat.h"
#include "internal.h"
#include "avio_internal.h"
+#include "mux.h"
#include "pcm.h"
#include "libavutil/avassert.h"
@@ -331,19 +332,19 @@ static int au_write_trailer(AVFormatContext *s)
return 0;
}
-const AVOutputFormat ff_au_muxer = {
- .name = "au",
- .long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
- .mime_type = "audio/basic",
- .extensions = "au",
+const FFOutputFormat ff_au_muxer = {
+ .p.name = "au",
+ .p.long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
+ .p.mime_type = "audio/basic",
+ .p.extensions = "au",
+ .p.codec_tag = au_codec_tags,
+ .p.audio_codec = AV_CODEC_ID_PCM_S16BE,
+ .p.video_codec = AV_CODEC_ID_NONE,
+ .p.flags = AVFMT_NOTIMESTAMPS,
.priv_data_size = sizeof(AUContext),
- .audio_codec = AV_CODEC_ID_PCM_S16BE,
- .video_codec = AV_CODEC_ID_NONE,
.write_header = au_write_header,
.write_packet = ff_raw_write_packet,
.write_trailer = au_write_trailer,
- .codec_tag = au_codec_tags,
- .flags = AVFMT_NOTIMESTAMPS,
};
#endif /* CONFIG_AU_MUXER */