diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-04 16:52:07 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-25 23:01:54 +0200 |
| commit | 45bfe8b838275235412777dd430206d9a24eb3ee (patch) | |
| tree | d35a1ee7436b0259fd26d32bc80482c0a9f2927e /libavformat/subtitles.c | |
| parent | 530ac6aa305aeda631c77f8a17e96c14c7ab1a1c (diff) | |
avformat/avio: Move internal AVIOContext fields to avio_internal.h
Currently AVIOContext's private fields are all over AVIOContext.
This commit moves them into a new structure in avio_internal.h instead.
Said structure contains the public AVIOContext as its first element
in order to avoid having to allocate a separate AVIOContextInternal
which is costly for those use cases where one just wants to access
an already existing buffer via the AVIOContext-API.
For these cases ffio_init_context() can't fail and always returned zero,
which was typically not checked. Therefore it has been made to not
return anything.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/subtitles.c')
| -rw-r--r-- | libavformat/subtitles.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index f80a439bcc..c6701c6a60 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -51,9 +51,8 @@ void ff_text_init_avio(void *s, FFTextReader *r, AVIOContext *pb) void ff_text_init_buf(FFTextReader *r, void *buf, size_t size) { - memset(&r->buf_pb, 0, sizeof(r->buf_pb)); ffio_init_context(&r->buf_pb, buf, size, 0, NULL, NULL, NULL, NULL); - ff_text_init_avio(NULL, r, &r->buf_pb); + ff_text_init_avio(NULL, r, &r->buf_pb.pub); } int64_t ff_text_pos(FFTextReader *r) |