aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpol <>2020-10-10 19:22:18 -0400
committerAndriy Gelman <andriy.gelman@gmail.com>2021-01-17 21:36:16 -0500
commit71ce5c32f0bfcbe053bc9110923bbe7479c358e3 (patch)
tree7530ce5434f0cd71f42803b39cc92fe54a4e877e
parent41ddb27597ea7ea2aeeebb8b7f3dec55fd244b1a (diff)
downloadffmpeg-71ce5c32f0bfcbe053bc9110923bbe7479c358e3.tar.gz
avformat/rtsp: correctly set media control uri with mpegts
Fixes #1941 Currently the media control uri is not correctly assigned when mpegts is signalled in the media description. The code checks whether at least one AVStream has been setup before assigning to the media's uri. With mpegts the AVStreams are setup when parsing packets and so the media's uri is skipped. This is fixed by using rt->nb_rtsp_streams in the check which counts all medias in the sdp. Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
-rw-r--r--libavformat/rtsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d1f5762f7c..1b24496f3c 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -571,7 +571,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
break;
case 'a':
if (av_strstart(p, "control:", &p)) {
- if (s->nb_streams == 0) {
+ if (rt->nb_rtsp_streams == 0) {
if (!strncmp(p, "rtsp://", 7))
av_strlcpy(rt->control_uri, p,
sizeof(rt->control_uri));