Fixed issue with image scaling etc when streaming.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2010-12-13 22:30:22 +00:00
parent 192b1310b8
commit 061a324a36
1 changed files with 2 additions and 5 deletions

View File

@ -3304,12 +3304,9 @@ bool MonitorStream::sendFrame( const char *filepath, struct timeval *timestamp )
bool MonitorStream::sendFrame( Image *image, struct timeval *timestamp )
{
if ( !config.timestamp_on_capture && timestamp )
{
monitor->TimestampImage( image, timestamp );
}
Image *send_image = prepareImage( image );
if ( !config.timestamp_on_capture && timestamp )
monitor->TimestampImage( send_image, timestamp );
#if HAVE_LIBAVCODEC
if ( type == STREAM_MPEG )