ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into plugin_support_test

This commit is contained in:
Emmanuel Papin 2015-02-27 19:46:55 +01:00
parent 9929233e75 0346aab075
commit b1dbb23f13
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_rtsp.cpp
View File

@ -440,7 +440,11 @@ int RtspThread::run()
} }
else else
{ {
if ( *trackUrl.rbegin() != '/') {
trackUrl += "/" + controlUrl; trackUrl += "/" + controlUrl;
} else {
trackUrl += controlUrl;
}
} }
rtpClock = mediaDesc->getClock(); rtpClock = mediaDesc->getClock();
codecId = mFormatContext->streams[i]->codec->codec_id; codecId = mFormatContext->streams[i]->codec->codec_id;