mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-10-25 07:48:26 -04:00
Merge pull request #557 from manupap1/rtsp_fix
Fixed bug in rtsp streaming caused by a bad string concatenation
This commit is contained in:
commit
22a0daaac8
1 file changed
+10
-1
+10
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user