summaryrefslogtreecommitdiff
path: root/libavformat/nullenc.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/nullenc.c
parentf23ae839fc184c4492e10f371cde5c1b55e51522 (diff)
downloadffmpeg-59c9dc82f450638a3068deeb1db5c56f6d155752.tar.gz
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/nullenc.c')
-rw-r--r--libavformat/nullenc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c
index 3deca5a7ed..60bde2a069 100644
--- a/libavformat/nullenc.c
+++ b/libavformat/nullenc.c
@@ -27,12 +27,12 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
-const AVOutputFormat ff_null_muxer = {
- .name = "null",
- .long_name = NULL_IF_CONFIG_SMALL("raw null video"),
- .audio_codec = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE),
- .video_codec = AV_CODEC_ID_WRAPPED_AVFRAME,
+const FFOutputFormat ff_null_muxer = {
+ .p.name = "null",
+ .p.long_name = NULL_IF_CONFIG_SMALL("raw null video"),
+ .p.audio_codec = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE),
+ .p.video_codec = AV_CODEC_ID_WRAPPED_AVFRAME,
.write_packet = null_write_packet,
- .flags = AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS,
+ .p.flags = AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS,
.interleave_packet = ff_interleave_packet_passthrough,
};