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

844 Commits

Author SHA1 Message Date
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
Edward Barnard 5d9dcba2d8 Adds support more H264 NAL types and tidies function 2013-11-30 22:00:52 +00:00
Edward Barnard 21946b5854 H264 SPS and PPS frames are now handled correctly 2013-11-30 21:59:04 +00:00
Edward Barnard 80d172efa1 The last packet of a fragmented mpeg4 frame is no longer rejected. 2013-11-29 16:15:56 +00:00
Edward Barnard 3665c3ee3a Fixed bug in mpeg4 depacketizer and RTCP implementation. 2013-11-28 23:07:46 +00:00
Edward Barnard 560d9bd809 RtpSource can now distinguish between payload types and handles some properly. 2013-11-28 21:32:06 +00:00
Kfir Itzhak d50169c383 Added SWScale wrapper class and FFMPEG PixelFormat match function 2013-11-26 16:34:26 +02:00
Kfir Itzhak 88f2bc6b63 Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess 2013-11-24 15:37:47 +02:00
Kfir Itzhak eff58367b4 IPv6 improvements 2013-11-22 15:30:05 +02:00
Kfir Itzhak 6a23a051c6 Merge pull request #252 from guotie/master 
ipv6 support to http remote camera code
 2013-11-19 06:27:20 -08:00
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02:00
Isaac Connor fe829e7a4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-11-06 16:58:23 -05:00
Kfir Itzhak 891757da74 Merge pull request #232 from josephevans/master 
Cast content_length to signed int for error-check comparison
 2013-11-04 11:59:44 -08:00
Isaac Connor f6bf3743f7 very sub-optimisation, removing duplicate comparisons 2013-11-04 10:50:40 -05:00
Kfir Itzhak c1970a51e3 Fix few errors and syntax errors regarding curl 2013-11-04 17:10:07 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak 4e1d23669f Revert content_length to be int 2013-11-04 10:54:39 +02:00
Kfir Itzhak 408cac5120 Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now) 2013-11-04 09:11:33 +02:00
Kfir Itzhak 833705b613 Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled 2013-11-03 10:26:04 +02:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
Joe Evans 550040474f Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer. 2013-11-01 14:11:48 -07:00
Kfir Itzhak 3c59961846 Merge branch 'cmake-outofsource' 2013-11-01 14:01:42 +02:00