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/gsmdec.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/gsmdec.c')
| -rw-r--r-- | libavformat/gsmdec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index 7150daa510..10fba212e9 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -23,6 +23,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "avformat.h" +#include "demux.h" #include "internal.h" #define GSM_BLOCK_SIZE 33 @@ -102,15 +103,15 @@ static const AVClass gsm_class = { .version = LIBAVUTIL_VERSION_INT, }; -const AVInputFormat ff_gsm_demuxer = { - .name = "gsm", - .long_name = NULL_IF_CONFIG_SMALL("raw GSM"), +const FFInputFormat ff_gsm_demuxer = { + .p.name = "gsm", + .p.long_name = NULL_IF_CONFIG_SMALL("raw GSM"), + .p.flags = AVFMT_GENERIC_INDEX, + .p.extensions = "gsm", + .p.priv_class = &gsm_class, .priv_data_size = sizeof(GSMDemuxerContext), .read_probe = gsm_probe, .read_header = gsm_read_header, .read_packet = gsm_read_packet, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "gsm", .raw_codec_id = AV_CODEC_ID_GSM, - .priv_class = &gsm_class, }; |