From: Andriy Gelman <andriy.gel...@gmail.com>
Currently a repeating setup request (with the same stream id) will
simply overwrite rtp_handle/transport_priv without freeing the
resources first. This is fixed by closing the previous setup request.
Signed-off-by: Andriy Gelman <andriy.gel...@gmail.com>
---
libavformat/rtspdec.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index be11576913..221f44b20b 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -274,6 +274,17 @@ static int rtsp_read_setup(AVFormatContext *s, char* host,
char *controlurl)
rtsp_st = rt->rtsp_streams[streamid];
localport = rt->rtp_port_min;
+ /* check if the stream has already been setup */
+ if (rtsp_st->transport_priv) {
+ if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RDT)
+ ff_rdt_parse_close(rtsp_st->transport_priv);
+ else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RTP)
+ ff_rtp_parse_close(rtsp_st->transport_priv);
+ rtsp_st->transport_priv = NULL;
+ }
+ if (rtsp_st->rtp_handle)
+ ffurl_closep(&rtsp_st->rtp_handle);
+
if (request.transports[0].lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
rt->lower_transport = RTSP_LOWER_TRANSPORT_TCP;
if ((ret = ff_rtsp_open_transport_ctx(s, rtsp_st))) {
--
2.28.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
