diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-24 14:58:07 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-17 04:58:34 +0200 |
| commit | fed02825081bd6441f865c9cfcf50e384b2392f5 (patch) | |
| tree | b42f4b433b1652e4ad65bc0b5066fe3e80d5662f /libavformat/r3d.c | |
| parent | dfbf41775cb58a9218a8b39b0dc6fd8de3f1ab35 (diff) | |
| download | ffmpeg-fed02825081bd6441f865c9cfcf50e384b2392f5.tar.gz | |
avformat: Avoid allocation for AVFormatInternal
Do this by allocating AVFormatContext together with the data that is
currently in AVFormatInternal; or rather: Put AVFormatContext at the
beginning of a new structure called FFFormatContext (which encompasses
more than just the internal fields and is a proper context in its own
right, hence the name) and remove AVFormatInternal altogether.
The biggest simplifications occured in avformat_alloc_context(), where
one can now simply call avformat_free_context() in case of errors.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/r3d.c')
| -rw-r--r-- | libavformat/r3d.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 004efac355..c98e3dbc66 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -160,6 +160,7 @@ static void r3d_read_reos(AVFormatContext *s) static int r3d_read_header(AVFormatContext *s) { + FFFormatContext *const si = ffformatcontext(s); R3DContext *r3d = s->priv_data; Atom atom; int ret; @@ -183,8 +184,8 @@ static int r3d_read_header(AVFormatContext *s) if (r3d->audio_channels) s->ctx_flags |= AVFMTCTX_NOHEADER; - s->internal->data_offset = avio_tell(s->pb); - av_log(s, AV_LOG_TRACE, "data offset %#"PRIx64"\n", s->internal->data_offset); + si->data_offset = avio_tell(s->pb); + av_log(s, AV_LOG_TRACE, "data offset %#"PRIx64"\n", si->data_offset); if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) return 0; // find REOB/REOF/REOS to load index @@ -210,7 +211,7 @@ static int r3d_read_header(AVFormatContext *s) } out: - avio_seek(s->pb, s->internal->data_offset, SEEK_SET); + avio_seek(s->pb, si->data_offset, SEEK_SET); return 0; } |