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/rmdec.c | |
| parent | bb81c60927d8ff53286ffe1b5d9607757180b8ae (diff) | |
| download | ffmpeg-b800327f4c7233d09baca958121722a04c2035ff.tar.gz | |
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/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index d0062c47bb..ded194bddd 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -1145,9 +1145,9 @@ static int rm_read_seek(AVFormatContext *s, int stream_index, } -const AVInputFormat ff_rm_demuxer = { - .name = "rm", - .long_name = NULL_IF_CONFIG_SMALL("RealMedia"), +const FFInputFormat ff_rm_demuxer = { + .p.name = "rm", + .p.long_name = NULL_IF_CONFIG_SMALL("RealMedia"), .priv_data_size = sizeof(RMDemuxContext), .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = rm_probe, @@ -1158,12 +1158,12 @@ const AVInputFormat ff_rm_demuxer = { .read_seek = rm_read_seek, }; -const AVInputFormat ff_rdt_demuxer = { - .name = "rdt", - .long_name = NULL_IF_CONFIG_SMALL("RDT demuxer"), +const FFInputFormat ff_rdt_demuxer = { + .p.name = "rdt", + .p.long_name = NULL_IF_CONFIG_SMALL("RDT demuxer"), + .p.flags = AVFMT_NOFILE, .priv_data_size = sizeof(RMDemuxContext), .read_close = rm_read_close, - .flags = AVFMT_NOFILE, }; static int ivr_probe(const AVProbeData *p) @@ -1398,14 +1398,14 @@ static int ivr_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } -const AVInputFormat ff_ivr_demuxer = { - .name = "ivr", - .long_name = NULL_IF_CONFIG_SMALL("IVR (Internet Video Recording)"), +const FFInputFormat ff_ivr_demuxer = { + .p.name = "ivr", + .p.long_name = NULL_IF_CONFIG_SMALL("IVR (Internet Video Recording)"), + .p.extensions = "ivr", .priv_data_size = sizeof(RMDemuxContext), .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = ivr_probe, .read_header = ivr_read_header, .read_packet = ivr_read_packet, .read_close = rm_read_close, - .extensions = "ivr", }; |