From e764938a0d652a0e24db0fa6dde416b583a281df Mon Sep 17 00:00:00 2001 From: manupap1 Date: Thu, 6 Nov 2014 10:16:28 +0100 Subject: [PATCH] Fixed bug in rtsp streaming caused by a bad string concatenation --- src/zm_rtsp.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp index ad15ec023..05908cbdf 100644 --- a/src/zm_rtsp.cpp +++ b/src/zm_rtsp.cpp @@ -414,7 +414,16 @@ int RtspThread::run() if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO ) #endif { - trackUrl += "/"+mediaDesc->getControlUrl(); + // Check if control Url is absolute or relative + std::string controlUrl = mediaDesc->getControlUrl(); + if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin())) + { + trackUrl = controlUrl; + } + else + { + trackUrl += "/" + controlUrl; + } rtpClock = mediaDesc->getClock(); codecId = mFormatContext->streams[i]->codec->codec_id; // Hackery pokery