diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-10 15:50:43 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:31 -0300 |
| commit | b800327f4c7233d09baca958121722a04c2035ff (patch) | |
| tree | df7ca79d0050cbbe27eda932d7047e3f53f281ae /libavformat/rsodec.c | |
| parent | bb81c60927d8ff53286ffe1b5d9607757180b8ae (diff) | |
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 <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/rsodec.c')
| -rw-r--r-- | libavformat/rsodec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index 569368b422..62a2964414 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -23,6 +23,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "demux.h" #include "internal.h" #include "pcm.h" #include "rso.h" @@ -71,12 +72,12 @@ static int rso_read_header(AVFormatContext *s) return 0; } -const AVInputFormat ff_rso_demuxer = { - .name = "rso", - .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), - .extensions = "rso", +const FFInputFormat ff_rso_demuxer = { + .p.name = "rso", + .p.long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), + .p.extensions = "rso", + .p.codec_tag = ff_rso_codec_tags_list, .read_header = rso_read_header, .read_packet = ff_pcm_read_packet, .read_seek = ff_pcm_read_seek, - .codec_tag = ff_rso_codec_tags_list, }; |