summaryrefslogtreecommitdiff
path: root/libavformat/alp.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/alp.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/alp.c')
-rw-r--r--libavformat/alp.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libavformat/alp.c b/libavformat/alp.c
index 40e4890a38..8c6066a59c 100644
--- a/libavformat/alp.c
+++ b/libavformat/alp.c
@@ -25,6 +25,7 @@
#include "libavutil/channel_layout.h"
#include "avformat.h"
#include "internal.h"
+#include "mux.h"
#include "rawenc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/internal.h"
@@ -290,16 +291,16 @@ static const AVClass alp_muxer_class = {
.version = LIBAVUTIL_VERSION_INT
};
-const AVOutputFormat ff_alp_muxer = {
- .name = "alp",
- .long_name = NULL_IF_CONFIG_SMALL("LEGO Racers ALP"),
- .extensions = "tun,pcm",
- .audio_codec = AV_CODEC_ID_ADPCM_IMA_ALP,
- .video_codec = AV_CODEC_ID_NONE,
+const FFOutputFormat ff_alp_muxer = {
+ .p.name = "alp",
+ .p.long_name = NULL_IF_CONFIG_SMALL("LEGO Racers ALP"),
+ .p.extensions = "tun,pcm",
+ .p.audio_codec = AV_CODEC_ID_ADPCM_IMA_ALP,
+ .p.video_codec = AV_CODEC_ID_NONE,
+ .p.priv_class = &alp_muxer_class,
.init = alp_write_init,
.write_header = alp_write_header,
.write_packet = ff_raw_write_packet,
- .priv_class = &alp_muxer_class,
.priv_data_size = sizeof(ALPMuxContext)
};
#endif