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/mpjpegdec.c | |
| parent | 530ac6aa305aeda631c77f8a17e96c14c7ab1a1c (diff) | |
| download | ffmpeg-45bfe8b838275235412777dd430206d9a24eb3ee.tar.gz | |
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/mpjpegdec.c')
| -rw-r--r-- | libavformat/mpjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 28a24184a2..559a375d8d 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -113,7 +113,7 @@ static int mpjpeg_read_close(AVFormatContext *s) static int mpjpeg_read_probe(const AVProbeData *p) { - AVIOContext pb; + FFIOContext pb; int ret = 0; int size = 0; @@ -122,7 +122,7 @@ static int mpjpeg_read_probe(const AVProbeData *p) ffio_init_context(&pb, p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL); - ret = (parse_multipart_header(&pb, &size, "--", NULL) >= 0) ? AVPROBE_SCORE_MAX : 0; + ret = (parse_multipart_header(&pb.pub, &size, "--", NULL) >= 0) ? AVPROBE_SCORE_MAX : 0; return ret; } |