From b800327f4c7233d09baca958121722a04c2035ff Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 10 Feb 2024 15:50:43 +0100 Subject: avformat/avformat: Add FFInputFormat, hide internals of AVInputFormat This commit does for AVInputFormat what commit 59c9dc82f450638a3068deeb1db5c56f6d155752 did for AVOutputFormat: It adds a new type FFInputFormat, moves all the internals of AVInputFormat to it and adds a now reduced AVInputFormat as first member. This does not affect/improve extensibility of both public or private fields for demuxers (it is still a mess due to lavd). This is possible since 50f34172e0cca2cabc5836308ec66dbf93f5f2a3 (which removed the last usage of an internal field of AVInputFormat in fftools). (Hint: tools/probetest.c accesses the internals of FFInputFormat as well, but given that it is a testing tool this is not considered a problem.) Signed-off-by: Andreas Rheinhardt --- libavformat/dtsdec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libavformat/dtsdec.c') diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index ceedb2eb49..38ba3e73d4 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -27,6 +27,7 @@ #include "libavcodec/get_bits.h" #include "avformat.h" +#include "demux.h" #include "rawdec.h" static int dts_probe(const AVProbeData *p) @@ -132,15 +133,15 @@ static int dts_probe(const AVProbeData *p) return 0; } -const AVInputFormat ff_dts_demuxer = { - .name = "dts", - .long_name = NULL_IF_CONFIG_SMALL("raw DTS"), +const FFInputFormat ff_dts_demuxer = { + .p.name = "dts", + .p.long_name = NULL_IF_CONFIG_SMALL("raw DTS"), + .p.flags = AVFMT_GENERIC_INDEX, + .p.extensions = "dts", + .p.priv_class = &ff_raw_demuxer_class, .read_probe = dts_probe, .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "dts", .raw_codec_id = AV_CODEC_ID_DTS, .priv_data_size = sizeof(FFRawDemuxerContext), - .priv_class = &ff_raw_demuxer_class, }; -- cgit v1.2.3