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

1367 Commits

Author SHA1 Message Date
Kaarle Ritvanen 5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Isaac Connor 68babd783b Merge branch 'master' into storageareas 2016-02-17 09:46:56 -05: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
Isaac Connor b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -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
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05: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 1504b368db Warning to Debug for Storage class with no Id 2016-01-04 15:21:23 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Isaac Connor 3a18a62bc6 Add ServerId column when inserting log line into database 2015-12-30 08:29:45 -05:00
Isaac Connor 98b6ef36d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	src/zm_monitor.cpp
 2015-12-28 13:13:15 -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 eccfced6d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-22 09:54:13 -05: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
Isaac Connor ca07b951cb Merge branch 'master' into newpointone 
Conflicts:
	docs/installationguide/ubuntu.rst
 2015-12-21 12:41:25 -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 6bb22a9a1b change method from getPath to Path 2015-12-15 13:27:25 -05:00
Isaac Connor 7588f6088f change method from getPath to Path 2015-12-15 13:27:18 -05:00
Isaac Connor 916cfe5ee6 change method from getPath to Path 2015-12-15 12:10:07 -05:00
Isaac Connor 0f4757b1ad change method from getPath to Path 2015-12-15 12:10:01 -05:00
Isaac Connor 6daa8e2290 add server_id to event_data 2015-12-15 12:09:45 -05:00
Isaac Connor 2597bbd9bf use storage object instead of config.dir_events 2015-12-15 12:09:34 -05:00
Isaac Connor 1151fe39ab More debug lines, and use the default config.events_dir path when not specified otherwise 2015-12-15 11:17:32 -05:00
Isaac Connor d7568180fe add getStorage method to return the desired Storage Area object 2015-12-15 11:16:51 -05:00
Isaac Connor 010d7b3d64 convert to using storage->getPath instaed of config.events_dir 2015-12-15 11:11:34 -05:00
Isaac Connor 6aadd7330a make loading a null or invalid storage area not be fatal, but use the default path 2015-12-15 09:39:29 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05: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
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
Heng Liu 17e65d12b4 fixed SaveJPEGs are not working 
which is caused in errors introduced when merging with master
 2015-10-31 21:27:23 -07:00
Isaac Connor 44168ce05e Merge branch 'master' into multi-server 2015-10-30 11:29:03 -04:00
SteveGilvarry 650d93435e Remove syslog.h 2015-10-30 21:42:58 +11:00
inflex 6e2e33cf89 Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file 2015-10-30 19:05:40 +10:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11: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
Steve Gilvarry ac8d9fe76a Merge pull request #1118 from liucougar/fix_crash_in_ubuntu1404 
feature-h264-videostorage - Fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc…
 2015-10-23 22:24:26 +11:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Heng Liu fee883f61a fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8) 
when libx264 is not installed
 2015-10-22 22:52:41 -07: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
Isaac Connor 09e5463a81 test for value in server_id before atoi 2015-08-27 11:16:58 -04:00
Isaac Connor bca9a19488 tabs to spaces 2015-08-27 11:14:00 -04:00
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server 
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
 2015-08-27 10:34:47 -04:00