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/rpl.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/rpl.c')
| -rw-r--r-- | libavformat/rpl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 296cb2c984..459791ffd3 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -311,6 +311,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) RPLContext *rpl = s->priv_data; AVIOContext *pb = s->pb; AVStream* stream; + FFStream *sti; AVIndexEntry* index_entry; int ret; @@ -320,11 +321,12 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) } stream = s->streams[rpl->chunk_part]; + sti = ffstream(stream); - if (rpl->chunk_number >= stream->internal->nb_index_entries) + if (rpl->chunk_number >= sti->nb_index_entries) return AVERROR_EOF; - index_entry = &stream->internal->index_entries[rpl->chunk_number]; + index_entry = &sti->index_entries[rpl->chunk_number]; if (rpl->frame_in_part == 0) { if (avio_seek(pb, index_entry->pos, SEEK_SET) < 0) |