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

whitespace fixes

This commit is contained in:
Isaac Connor 2016-04-06 10:50:00 -04:00
parent 0ef02287dd
commit 9aeba8ced8
1 changed files with 178 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zm_remote_camera_rtsp.cpp
View File

@ -174,7 +174,7 @@ int RemoteCameraRtsp::PrimeCapture()
mVideoStreamId = -1; mVideoStreamId = -1;
// Find the first video stream. // Find the first video stream.
for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0)) #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO ) if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
#else #else
@ -184,6 +184,7 @@ int RemoteCameraRtsp::PrimeCapture()
mVideoStreamId = i; mVideoStreamId = i;
break; break;
} }
}
if ( mVideoStreamId == -1 ) if ( mVideoStreamId == -1 )
Fatal( "Unable to locate video stream" ); Fatal( "Unable to locate video stream" );
@ -242,7 +243,8 @@ int RemoteCameraRtsp::PrimeCapture()
return( 0 ); return( 0 );
} }
int RemoteCameraRtsp::PreCapture() { int RemoteCameraRtsp::PreCapture()
{
if ( !rtspThread->isRunning() ) if ( !rtspThread->isRunning() )
return( -1 ); return( -1 );
if ( !rtspThread->hasSources() ) if ( !rtspThread->hasSources() )
@ -265,7 +267,8 @@ int RemoteCameraRtsp::Capture( Image &image ) {
return (-1); return (-1);
} }
while ( true ) { while ( true )
{
buffer.clear(); buffer.clear();
if ( !rtspThread->isRunning() ) if ( !rtspThread->isRunning() )
return (-1); return (-1);