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/rtsp.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/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 9869e1b72e..3772a7f2a9 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2496,7 +2496,7 @@ static int rtp_read_header(AVFormatContext *s) int payload_type; AVCodecParameters *par = NULL; struct sockaddr_storage addr; - AVIOContext pb; + FFIOContext pb; socklen_t addrlen = sizeof(addr); RTSPState *rt = s->priv_data; const char *p; @@ -2594,7 +2594,7 @@ static int rtp_read_header(AVFormatContext *s) avcodec_parameters_free(&par); ffio_init_context(&pb, sdp.str, sdp.len, 0, NULL, NULL, NULL, NULL); - s->pb = &pb; + s->pb = &pb.pub; /* if sdp_read_header() fails then following ff_network_close() cancels out */ /* ff_network_init() at the start of this function. Otherwise it cancels out */ |