mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-03 21:48:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,642 Commits 73 Branches 104 Tags
a87f75eee0ccbb569e0982feefa0858aa58ff3fa
Commit Graph

896 Commits

Author SHA1 Message Date
root
cca01dc357 connect to the monitor, because instantiating the object no longer does that 2014-07-30 14:20:48 -04:00
Isaac Connor
2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor
7147d47a76 Improve error messages when empty mmap file to reduce FAQ 2014-07-29 09:45:19 -04:00
Isaac Connor
585a1c50a1 Merge branch 'nommap' 2014-07-24 14:40:37 -04:00
Isaac Connor
edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04:00
Isaac Connor
4f694ee8cf fix 2014-07-14 13:07:23 -04:00
Isaac Connor
99a3684fb5 change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi 2014-07-14 12:53:48 -04:00
Isaac Connor
9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Andrew Bauer
9163536219 Merge pull request #358 from knnniggett/prevbutton 
Fix prev button while in gapless mode.  All buttons tested and working.
 2014-07-04 10:33:05 -05:00
Isaac Connor
6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Isaac Connor
07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -04:00
Isaac Connor
8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor
20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor
0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Kfir Itzhak
a9cd6caeaf Minor corrections to cURL code 2014-06-06 09:35:02 +03:00
Isaac Connor
93aed26a00 escape username and password inside zm_user 
by rogerroger288
 2014-06-05 15:18:02 -04:00
Kfir Itzhak
5fea101294 Merge pull request #421 from m-bene/ffmpegoptions 
Add optional options field for ffmpeg and VLC source types
 2014-05-18 18:07:42 +03:00
m-bene
a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene
9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene
1b4f9c082c change check for av_dict_set success 2014-05-15 16:01:29 +02:00
m-bene
6016206f98 modify debug message 2014-05-15 15:42:27 +02:00
m-bene
5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene
c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
Isaac Connor
00aad4a128 frame_count should be an integer so don't use NULL 2014-05-05 13:06:58 -04:00
Isaac Connor
8333e909ed Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-05-05 11:29:55 -04:00
Isaac Connor
a8929914bb add a NULL test for frame_coutn before calling atoi. 2014-05-05 11:29:09 -04:00
m-bene
ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene
ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Kfir Itzhak
4de46c7988 Fix wrong values used for type boolean 2014-05-05 09:26:32 +03:00
aztazt
e916ce22d9 Update zm_jpeg.cpp 
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:

[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
 2014-05-04 02:35:17 +02:00
Kfir Itzhak
3eee90f811 Fix wrong no signal color bug introduced in zm v1.26. Thanks to forum user jcrews for spotting this 
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21876
 2014-04-23 13:27:43 +03:00
Kfir Itzhak
3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' 
Conflicts:
	db/zm_update-1.27.1.sql
	web/lang/nl_nl.php
 2014-04-22 20:13:11 +03:00
Kfir Itzhak
0dbcc836b4 Merge pull request #325 from elenril/master 
Support building with new libavcodec versions.
 2014-04-19 00:08:39 +03:00
Sune1337
a8a0bf922f Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here" 2014-04-10 15:53:28 +02:00
Sune1337
6c637947e2 Ability to skip frames in motion detection. 
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
 2014-04-10 14:59:34 +02:00
Andrew Bauer
35468af815 Merge pull request #338 from m-bene/extendPreclusive 
add feature to extend preclusive zone alarm state by x frames
 2014-04-08 08:04:37 -05:00
Andrew Bauer
b126ca3e01 modify play button 2014-03-30 11:18:14 -05:00
Andrew Bauer
3f7f398210 rework prev and next buttons 2014-03-28 17:18:34 -05:00
Andrew Bauer
d60b4a2eee Merge pull request #352 from m-bene/CurlHeaderCase 
make curl header check case insensitive
 2014-03-25 17:23:56 -05:00
Andrew Bauer
264b98548f Fix prev button while in gapless mode. All buttons tested and working. 2014-03-25 17:12:26 -05:00
Andrew Bauer
d2be7d4cd8 Update zm_event.cpp 
Commit 79af2adaa0 attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
 2014-03-25 07:01:40 -05:00
m-bene
32941cfef7 make curl header check case insensitive 2014-03-23 07:06:54 +01:00
m-bene
2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
Andrew Bauer
69f6af93d1 Patch for Debian bug 736516 - FTBFS on powerpc arch. 2014-03-16 10:51:54 -05:00
Andrew Bauer
11fde73be1 This fixes a compile issue on i386 plaforms with the PIC compiler flag set 2014-03-15 11:38:10 -05:00
m-bene
26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Anton Khirnov
296aa2517b Support building with new libavcodec versions. 
CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream.
 2014-02-06 08:39:47 +01:00
Andrew Bauer
f5eedb2bfc Merge pull request #302 from pjhacnau/master 
Additional compile guards to allow compilation on non-x86 archs
 2014-02-01 14:02:47 -08:00
Kevin Dalley
af7a49d8d0 Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00