diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-24 19:41:16 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-17 13:22:25 +0200 |
| commit | 40bdd8cc05d9c98a18cf2b1c2a00c8a5a7b38113 (patch) | |
| tree | 0fc408f78b9b6934ac351cd4499c07737f8f6a62 /libavformat/av1dec.c | |
| parent | 9f05b3ba604a30eeb6f5ff877b8b5b5c93a268d7 (diff) | |
avformat: Avoid allocation for AVStreamInternal
Do this by allocating AVStream together with the data that is
currently in AVStreamInternal; or rather: Put AVStream at the
beginning of a new structure called FFStream (which encompasses
more than just the internal fields and is a proper context in its own
right, hence the name) and remove AVStreamInternal altogether.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/av1dec.c')
| -rw-r--r-- | libavformat/av1dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index e994312253..6e1c2a45ff 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -61,6 +61,7 @@ static int av1_read_header(AVFormatContext *s) AV1DemuxContext *const c = s->priv_data; const AVBitStreamFilter *filter = av_bsf_get_by_name("av1_frame_merge"); AVStream *st; + FFStream *sti; int ret; if (!filter) { @@ -72,12 +73,13 @@ static int av1_read_header(AVFormatContext *s) st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); + sti = ffstream(st); st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_AV1; - st->internal->need_parsing = AVSTREAM_PARSE_HEADERS; + sti->need_parsing = AVSTREAM_PARSE_HEADERS; - st->internal->avctx->framerate = c->framerate; + sti->avctx->framerate = c->framerate; // taken from rawvideo demuxers avpriv_set_pts_info(st, 64, 1, 1200000); |