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 <[email protected]>

1 files changed, 6 insertions, 5 deletions

diff --git a/libavformat/avr.c b/libavformat/avr.c
index dce977b6ac..12286c04d4 100644
--- a/libavformat/avr.c
+++ b/libavformat/avr.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "demux.h"
 #include "internal.h"
 #include "pcm.h"
 
@@ -90,13 +91,13 @@ static int avr_read_header(AVFormatContext *s)
     return 0;
 }
 
-const AVInputFormat ff_avr_demuxer = {
-    .name           = "avr",
-    .long_name      = NULL_IF_CONFIG_SMALL("AVR (Audio Visual Research)"),
+const FFInputFormat ff_avr_demuxer = {
+    .p.name         = "avr",
+    .p.long_name    = NULL_IF_CONFIG_SMALL("AVR (Audio Visual Research)"),
+    .p.extensions   = "avr",
+    .p.flags        = AVFMT_GENERIC_INDEX,
     .read_probe     = avr_probe,
     .read_header    = avr_read_header,
     .read_packet    = ff_pcm_read_packet,
     .read_seek      = ff_pcm_read_seek,
-    .extensions     = "avr",
-    .flags          = AVFMT_GENERIC_INDEX,
 };