avformat/avformat: Add FFInputFormat, hide internals of AVInputFormat
This commit does for AVInputFormat what commit59c9dc82f4did 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 since50f34172e0(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
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user