mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-17 15:08:09 +08:00
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>
This commit is contained in:

committed by
James Almer

parent
bb81c60927
commit
b800327f4c
@ -34,6 +34,7 @@
|
||||
#include "libavutil/channel_layout.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "avformat.h"
|
||||
#include "demux.h"
|
||||
#include "internal.h"
|
||||
|
||||
#define FLIC_FILE_MAGIC_1 0xAF11
|
||||
@ -285,9 +286,9 @@ static int flic_read_seek(AVFormatContext *s, int stream_index,
|
||||
return 0;
|
||||
}
|
||||
|
||||
const AVInputFormat ff_flic_demuxer = {
|
||||
.name = "flic",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation"),
|
||||
const FFInputFormat ff_flic_demuxer = {
|
||||
.p.name = "flic",
|
||||
.p.long_name = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation"),
|
||||
.priv_data_size = sizeof(FlicDemuxContext),
|
||||
.read_probe = flic_probe,
|
||||
.read_header = flic_read_header,
|
||||
|
Reference in New Issue
Block a user