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 /libavdevice/utils.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 'libavdevice/utils.c')
| -rw-r--r-- | libavdevice/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavdevice/utils.c b/libavdevice/utils.c index d9a52c53ab..c72a839dfa 100644 --- a/libavdevice/utils.c +++ b/libavdevice/utils.c @@ -19,6 +19,7 @@ #include "internal.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" +#include "libavformat/demux.h" int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat *iformat, const char *format) { @@ -38,8 +39,8 @@ int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat * goto error; } s->iformat = iformat; - if (s->iformat->priv_data_size > 0) { - s->priv_data = av_mallocz(s->iformat->priv_data_size); + if (ffifmt(s->iformat)->priv_data_size > 0) { + s->priv_data = av_mallocz(ffifmt(s->iformat)->priv_data_size); if (!s->priv_data) { ret = AVERROR(ENOMEM); goto error; |