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

1317 Commits

Author SHA1 Message Date
Isaac Connor 04800afaf5 Some documenting comments and debug lines, mostly just trying to understand what the code does 2016-04-05 12:30:22 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor 9287cd0e0a undo code style changes and whitespace changes 2016-04-01 15:47:40 -04:00
Isaac Connor 89598da5c1 undo code style changes and whitespace changes 2016-04-01 15:30:30 -04:00
Isaac Connor 58c39f930e revert some structure changes 2016-04-01 14:57:48 -04:00
Isaac Connor f4fc129ecf revert some structure changes 2016-04-01 14:15:31 -04:00
Isaac Connor 86c888d079 revert some structure changes 2016-04-01 14:14:02 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor 5c68e0c9cb structure, whitespace fixes. Add not storing audio frames 2016-03-31 15:33:27 -04:00
Isaac Connor c7e766faef finish the record_audio constructor defs 2016-03-31 13:30:31 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
Isaac Connor 2a3ed0c32c Add record_audio member, also correct whitespace 2016-03-31 12:17:17 -04:00
Isaac Connor 4e8255c80a Add record_audio member 2016-03-31 12:16:50 -04:00
Isaac Connor 92b98e1953 spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets 2016-03-31 11:55:21 -04:00
Isaac Connor fa08646243 spacing fix 2016-03-31 11:54:21 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor a16c1746e5 separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value 2016-03-24 10:00:02 -04:00
Isaac Connor 1e52a8ad2c remove unused class member 2016-03-24 09:44:34 -04:00
Isaac Connor b6ee4e4228 move return up into #ifdef. 2016-03-24 09:43:15 -04:00
Isaac Connor 0c32ae61ef Merge branch 'master' into fix_coverity_issues 2016-03-24 09:42:01 -04:00
Jon Burgess bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake. 
Conflicts:
	distros/debian8/control
 2016-02-26 22:41:27 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp. 
Conflicts:
	src/zmstreamer.cpp
 2016-02-26 22:37:23 +11:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
Kaarle Ritvanen 5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Isaac Connor 6f221ed269 Merge pull request #1278 from schrorg/bigfont-license 
Added script to generate src/zm_bigfont.h
 2016-02-16 09:17:54 -05:00
Kaarle Ritvanen 6332f28c53 zm_monitor: fix overlap in memcpy buffers 
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
 2016-02-16 11:47:49 +02:00
arjunrc e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05:00
Robin Daermann 226b77bb63 Added script to generate src/zm_bigfont.h 
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
 2016-02-10 11:28:56 +01:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 20:41:36 +11:00
SteveGilvarry fa7ec2179d Bring is more of the h264 code and add some master changes to the duplicated code 2016-02-05 01:47:13 +11:00
SteveGilvarry 64bc7398fc Fixes for remote h264 passthrough 2016-02-05 01:47:13 +11:00
SteveGilvarry 78b0a9d0a9 Add videostore to remote_rtsp, still need to check stream is h264 2016-02-05 01:47:12 +11:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
arjunrc 904f584fcb CMD_QUIT definition 2016-01-29 10:00:02 -05:00
arjunrc 38bca6b95d added CMD_QUIT to kill zms via command 2016-01-29 09:58:57 -05:00
arjunrc 47b2cdbb96 added CMD_QUIT to kill zms via command 2016-01-29 09:58:50 -05:00
Isaac Connor f275498790 Add Debug for sql used to load other than local monitors 2016-01-26 21:00:32 -05:00
Isaac Connor 902065a6c1 Add Debug for sql used to load local monitors 2016-01-26 20:59:07 -05:00
Isaac Connor 3a0b28f168 Add Debug/Info lines reporting multi-server status 2016-01-26 20:53:34 -05:00
Isaac Connor 3a18a62bc6 Add ServerId column when inserting log line into database 2015-12-30 08:29:45 -05:00
Isaac Connor f357ea6ccd Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-28 11:53:04 -05:00
Isaac Connor ccded54937 put back missing col++ 2015-12-28 11:52:40 -05:00
SteveGilvarry 3f1c782ff7 Fix random extra semicolon 2015-12-28 16:29:04 +11:00
Isaac Connor e76cc59bad revert whitespace changes 2015-12-21 13:42:44 -05:00
Isaac Connor 36f83aa412 revert whitespace changes 2015-12-21 13:35:17 -05:00
Isaac Connor 609ab79f81 revert whitespace changes 2015-12-21 13:32:57 -05:00
Isaac Connor 1fee421500 revert whitespace changes 2015-12-21 13:29:41 -05:00