From b800327f4c7233d09baca958121722a04c2035ff Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 10 Feb 2024 15:50:43 +0100 Subject: 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 --- libavformat/avisynth.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libavformat/avisynth.c') diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 0ccb8269ba..e85b9ae488 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -26,6 +26,7 @@ #include "libavcodec/internal.h" #include "avformat.h" +#include "demux.h" #include "internal.h" #include "config.h" @@ -1197,14 +1198,14 @@ static const AVClass avisynth_demuxer_class = { .version = LIBAVUTIL_VERSION_INT, }; -const AVInputFormat ff_avisynth_demuxer = { - .name = "avisynth", - .long_name = NULL_IF_CONFIG_SMALL("AviSynth script"), +const FFInputFormat ff_avisynth_demuxer = { + .p.name = "avisynth", + .p.long_name = NULL_IF_CONFIG_SMALL("AviSynth script"), + .p.extensions = "avs", + .p.priv_class = &avisynth_demuxer_class, .priv_data_size = sizeof(AviSynthContext), .read_header = avisynth_read_header, .read_packet = avisynth_read_packet, .read_close = avisynth_read_close, .read_seek = avisynth_read_seek, - .extensions = "avs", - .priv_class = &avisynth_demuxer_class, }; -- cgit v1.2.3