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 /tools/probetest.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 'tools/probetest.c')
| -rw-r--r-- | tools/probetest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/probetest.c b/tools/probetest.c index 6f0e002b74..e742d598b1 100644 --- a/tools/probetest.c +++ b/tools/probetest.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include "libavformat/avformat.h" +#include "libavformat/demux.h" #include "libavcodec/put_bits.h" #include "libavutil/lfg.h" #include "libavutil/timer.h" @@ -44,12 +45,12 @@ static void probe(AVProbeData *pd, int type, int p, int size) while ((fmt = av_demuxer_iterate(&fmt_opaque))) { if (fmt->flags & AVFMT_NOFILE) continue; - if (fmt->read_probe && + if (ffifmt(fmt)->read_probe && (!single_format || !strcmp(single_format, fmt->name)) ) { int score; int64_t start = AV_READ_TIME(); - score = fmt->read_probe(pd); + score = ffifmt(fmt)->read_probe(pd); time_array[i] += AV_READ_TIME() - start; if (score > score_array[i] && score > AVPROBE_SCORE_MAX / 4) { score_array[i] = score; |