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

1210 Commits

Author SHA1 Message Date
Andrew Bauer 28b30ecb47 Merge pull request #1377 from ZoneMinder/random_fixes 
Random fixes
 2016-04-11 12:04:05 -05: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 ecce87b779 mamke status a member so that we aren't return the address of a local variable 2016-03-31 14:43:22 -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
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