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

Merge pull request #1147 from SteveGilvarry/RTSPBuildWarning 

Reorder RTSPDescribe to avoid -wreorder warnings
This commit is contained in:
Andrew Bauer 2015-11-05 10:33:59 -06:00
parent 80d3e0be80 477e63a878
commit e8f31d7451
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_remote_camera_rtsp.cpp
View File

@ -30,8 +30,9 @@
RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture ),
rtspThread( 0 ),
rtsp_describe( p_rtsp_describe )
rtsp_describe( p_rtsp_describe ),
rtspThread( 0 )
{
if ( p_method == "rtpUni" )
method = RtspThread::RTP_UNICAST;

3
src/zm_rtsp.h
View File

@ -50,12 +50,13 @@ private:
private:
int mId;
bool mRtspDescribe;
RtspMethod mMethod;
std::string mProtocol;
std::string mHost;
std::string mPort;
std::string mPath;
bool mRtspDescribe;
std::string mUrl;
// Reworked authentication system