mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-23 00:03:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,444 Commits 80 Branches 104 Tags
a442ef3be8bdcbf6ca9243abfd8909f34a3e9550
Commit Graph

1190 Commits

Author SHA1 Message Date
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
Isaac Connor
c0a79567e6 revert whitespace changes 2015-12-21 13:26:24 -05:00
Isaac Connor
fdf1912ec1 revert whitespace changes 2015-12-21 13:11:18 -05:00
Isaac Connor
dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor
af9fc1de90 revert white space changes. 2015-12-21 12:57:05 -05:00
SteveGilvarry
af76d19646 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
Isaac Connor
688ee7f103 Merge branch 'zms_socket_lock' into multi-server 2015-12-04 16:41:26 -05:00
Isaac Connor
0fc68e2e91 delete lock when we are done with it 2015-12-04 16:38:24 -05:00
Isaac Connor
be36301779 use exclusive lock, add includes 2015-12-04 16:35:27 -05:00
Isaac Connor
6d605362fc Merge branch 'zms_socket_lock' into multi-server 2015-12-04 15:39:51 -05:00
Isaac Connor
e637915823 add a lock around the socket creating/deleting. 2015-12-04 15:39:37 -05:00
Isaac Connor
f7cc2fb44f Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-11-23 10:42:14 -05:00
Andrew Bauer
a9609d2a43 fix mem alloc fault in zm_monitor.cpp 2015-11-21 12:17:23 -06:00
Isaac Connor
4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
SteveGilvarry
477e63a878 Reorder RTSPDescribe to avoid -wreorder warnings 2015-11-05 17:19:58 +11:00
SteveGilvarry
5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11:00
SteveGilvarry
51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +11:00
SteveGilvarry
bc5ef6c599 Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
 2015-11-04 12:46:26 +11:00
Dmitry Smirnov
0ff7a4e616 Replace deprecated FFmpeg API 
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
 2015-11-03 11:58:23 +11:00
Isaac Connor
44168ce05e Merge branch 'master' into multi-server 2015-10-30 11:29:03 -04:00
baffo32
44cda8032b Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall 2015-10-24 20:07:42 -04:00
Isaac Connor
582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
Isaac Connor
ac8bfc71dc fix specifying ServerId 2015-10-02 18:22:48 +00:00
Isaac Connor
6ff4e333b4 Merge branch 'fix_warnings' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-10-02 15:34:05 +00:00
Isaac Connor
7b253bcd7e Debug line 2015-10-02 15:28:51 +00:00
Isaac Connor
24b79e81bc add include for basename on freebsd 2015-10-02 11:00:42 -04:00
Isaac Connor
8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Isaac Connor
e4b0e74f69 merge master 2015-09-24 10:01:27 -04:00
Dmitry Smirnov
333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Andrew Bauer
4a978034ad Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults 
Fix sgfault caused by the privacy mask stuff
 2015-09-16 10:46:45 -05:00
Isaac Connor
b8f2b1e0a0 Merge branch 'mmap_fd_gt_3' into multi-server 2015-09-16 11:01:06 -04:00
Isaac Connor
d991912ce4 Merge branch 'fix_privacy_mask_segfaults' into multi-server 2015-09-16 11:00:57 -04:00
Isaac Connor
e70d49b033 Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3 2015-09-16 10:58:57 -04:00
Isaac Connor
6e12febf3d initialize privacy_bitmask and check it before deletep[] to prevent segfault 2015-09-16 10:51:27 -04:00
Isaac Connor
0571ca3025 quick fix for #1055: make sure our mmap fd is > 2 2015-09-16 09:11:22 -04:00
Isaac Connor
bb41ebf776 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-08-31 16:03:40 -04:00
Andy Bauer
395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00