eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat: Avoid allocation for AVFormatInternal

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt
2021-08-24 14:58:07 +02:00
parent dfbf41775c
commit fed0282508
32 changed files with 135 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/r3d.c
View File

@@ -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;
}