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/aptxdec.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/aptxdec.c')
| -rw-r--r-- | libavformat/aptxdec.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 0637a8afde..2fca45a71e 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avformat.h" +#include "demux.h" #define APTX_BLOCK_SIZE 4 #define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE) @@ -101,27 +102,27 @@ static const AVClass aptx_demuxer_class = { }; #if CONFIG_APTX_DEMUXER -const AVInputFormat ff_aptx_demuxer = { - .name = "aptx", - .long_name = NULL_IF_CONFIG_SMALL("raw aptX"), - .extensions = "aptx", +const FFInputFormat ff_aptx_demuxer = { + .p.name = "aptx", + .p.long_name = NULL_IF_CONFIG_SMALL("raw aptX"), + .p.extensions = "aptx", + .p.flags = AVFMT_GENERIC_INDEX, + .p.priv_class = &aptx_demuxer_class, .priv_data_size = sizeof(AptXDemuxerContext), .read_header = aptx_read_header, .read_packet = aptx_read_packet, - .flags = AVFMT_GENERIC_INDEX, - .priv_class = &aptx_demuxer_class, }; #endif #if CONFIG_APTX_HD_DEMUXER -const AVInputFormat ff_aptx_hd_demuxer = { - .name = "aptx_hd", - .long_name = NULL_IF_CONFIG_SMALL("raw aptX HD"), - .extensions = "aptxhd", +const FFInputFormat ff_aptx_hd_demuxer = { + .p.name = "aptx_hd", + .p.long_name = NULL_IF_CONFIG_SMALL("raw aptX HD"), + .p.extensions = "aptxhd", + .p.flags = AVFMT_GENERIC_INDEX, + .p.priv_class = &aptx_demuxer_class, .priv_data_size = sizeof(AptXDemuxerContext), .read_header = aptx_hd_read_header, .read_packet = aptx_hd_read_packet, - .flags = AVFMT_GENERIC_INDEX, - .priv_class = &aptx_demuxer_class, }; #endif |