ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,469 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

865 Commits

Author SHA1 Message Date
m-bene c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02: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 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 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 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
Peter Howard 9a31bbb4d0 zm_signal.cpp needed extra compile guards too. Confirmed building on non-x86 (ia64 for convenience) 2014-01-23 16:09:42 +11:00
Peter Howard 5786af0d4e Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures. 2014-01-23 14:49:46 +11:00
Kfir Itzhak 784f9d925c Remove src/zm_config_defines.h from repository as its not needed, its generated by zmconfgen.pl and will cause conflicts when doing an out-of-source build 2014-01-12 13:27:59 +02:00
Kfir Itzhak a74b22a5ed Merge pull request #297 from ZoneMinder/curl 
Add cURL source type
 2014-01-11 06:04:03 -08:00
Kfir Itzhak 3ded7276e1 Attempt to fix zmu "Error, failed to enumerate standard X: Success" 
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
 2014-01-10 13:40:52 +02:00
Kfir Itzhak 936198de85 Fix typo 2014-01-10 09:27:55 +02:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 21f7ec12eb Added useful string functions that will be used later on for rtsp digest authentication 2014-01-08 15:57:17 +02:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak e202cdb6d0 Fixed digest authentication and minor changes 2014-01-05 10:15:28 +02:00
Kfir Itzhak f39667c0cd Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259, closes #285 2014-01-01 18:19:42 +02:00
Kfir Itzhak 0ff77d835b Improved error handling and other minor changes 2013-12-31 15:50:06 +02:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Kfir Itzhak 89cfb96855 Merge pull request #277 from ebarnard/libvlc 
Add libVLC source type
 2013-12-22 13:01:19 -08:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Ed Barnard 40b0f5d091 Merge pull request #1 from ZoneMinder/libvlc-improvements 
Add header file checks for vlc/vlc.h
 2013-12-21 17:07:57 -08:00
Edward Barnard 6c94308ba0 Fix bug in frame difference checker. 2013-12-22 01:06:12 +00:00
Kfir Itzhak dce1cbf0ce Add header file checks for vlc/vlc.h 2013-12-21 06:47:12 +02:00
Edward Barnard aa6380c4bd Might now build with autotools. 2013-12-19 23:15:16 +00:00
Edward Barnard 3e2647782d Better error handling 2013-12-19 23:10:45 +00:00
Edward Barnard f4d72752a8 Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates 2013-12-19 23:02:21 +00:00
Edward Barnard e4a16ee57c All colourspaces now working 2013-12-19 21:51:39 +00:00
Edward Barnard c25011e781 Fix seemingly random lockup. 2013-12-19 21:51:39 +00:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption 
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
 2013-12-13 10:13:34 -08:00
Kyle Johnson 45ad839f96 Merge pull request #259 from ebarnard/rtsp-fix 
Regression:  Fix RTSP decoding errors in 1.26.4 fixes #221
 2013-12-13 10:12:50 -08:00
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Edward Barnard c630174868 Adds support for h264 cameras that fail to set m bit for end of fragmented frames. 2013-12-07 11:21:10 +00:00
Edward Barnard 9a06ec51c6 Save a couple of cpu cycles. 2013-12-02 15:37:26 +00:00