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/dv.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/dv.c')
| -rw-r--r-- | libavformat/dv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index b2b74162df..4d27c95d98 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -441,9 +441,10 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c, int64_t timestamp, int flags) { // FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk) + FFFormatContext *const si = ffformatcontext(s); const int frame_size = c->sys->frame_size; int64_t offset; - int64_t size = avio_size(s->pb) - s->internal->data_offset; + int64_t size = avio_size(s->pb) - si->data_offset; int64_t max_offset = ((size - 1) / frame_size) * frame_size; offset = frame_size * timestamp; @@ -453,7 +454,7 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c, else if (offset < 0) offset = 0; - return offset + s->internal->data_offset; + return offset + si->data_offset; } void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset) |