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

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-03-21 09:53:41 -04:00
parent 670c1a3c7c df5a238857
commit 730d76189d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/ubuntu1604/control
View File

@ -37,7 +37,7 @@ Package: zoneminder
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
,javascript-common ,javascript-common
,libmp4v2-2, libx264-148, libswscale4 ,libmp4v2-2, libx264-148, libswscale-ffmpeg3|libswscale4
,ffmpeg | libav-tools ,ffmpeg | libav-tools
,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
,libdbd-mysql-perl ,libdbd-mysql-perl

2
src/zm_remote_camera_http.cpp
View File

@ -227,7 +227,7 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
} }
if ( total_bytes_to_read == 0 ) { if ( total_bytes_to_read == 0 ) {
if( mode == SINGLE_IMAGE ) { if ( mode == SINGLE_IMAGE ) {
int error = 0; int error = 0;
socklen_t len = sizeof (error); socklen_t len = sizeof (error);
int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len ); int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len );