Steve Gilvarry
|
dcf3852124
|
Starting to convert to boost.interprocess
|
2016-04-28 01:28:37 +10:00 |
|
Steve Gilvarry
|
7fcd12fab9
|
Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer
|
2016-04-25 22:06:07 +10:00 |
|
SteveGilvarry
|
966fbb1a10
|
Add Packet Queue
|
2016-04-04 20:04:14 +10:00 |
|
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
|
SteveGilvarry
|
23d437ab47
|
ffmpeg 3.0 API build failure fixes
|
2016-02-27 02:12:22 +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
|
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 |
|
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
|
e28e3c2b75
|
Merge branch 'master' into feature-h264-videostorage
|
2015-12-20 14:13:30 +11: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 |
|
SteveGilvarry
|
220ee5e516
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-11-29 13:17:22 +11: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
|
6002f251c0
|
Add FFMPEGInit back
|
2015-11-05 19:36:11 +11:00 |
|
SteveGilvarry
|
477e63a878
|
Reorder RTSPDescribe to avoid -wreorder warnings
|
2015-11-05 17:19:58 +11:00 |
Heng Liu
|
44f63443c1
|
video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
|
2015-11-04 14:43:45 -08:00 |
|
Heng Liu
|
4e263f5913
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
src/zm_ffmpeg.h
|
2015-11-04 14:39:52 -08:00 |
|
SteveGilvarry
|
5423be9eb8
|
Revert space removal around PRId64
|
2015-11-05 01:25:44 +11:00 |
|
SteveGilvarry
|
5b68656602
|
Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
|
2015-11-05 01:09:39 +11:00 |
|
SteveGilvarry
|
1c479a01f2
|
Fix PRId64 issue in travis, another try
|
2015-11-05 00:34:48 +11:00 |
|
SteveGilvarry
|
078dc85548
|
Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
|
2015-11-04 22:52:47 +11:00 |
|
SteveGilvarry
|
dc0506c597
|
Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
|
2015-11-04 22:33:29 +11:00 |