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

1262 Commits

Author SHA1 Message Date
Andy Bauer 873bb9902b recalculating zmswap at this point is unnesessary 2016-11-19 08:53:17 -06:00
Andy Bauer 3afa8937d8 calculate string lengths and array ndx's properly 2016-11-19 08:52:22 -06:00
Andy Bauer d3a7fca079 only unlink if zmc is being destroyed 2016-11-14 19:01:00 -06:00
Andy Bauer 6c7d71361a unlink the mmap file when the monitor object is destroyed 2016-11-13 16:40:54 -06:00
Isaac Connor 006fcad10a move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:35:14 -04:00
Isaac Connor dfb06fd548 Merge pull request #1607 from mattdurant/fix_issue_1460 
Fix issue #1460
 2016-09-01 14:02:13 -04:00
Matt Durant 350352d956 Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1. 2016-08-31 20:56:30 -05:00
Matt Durant 0950ecbcb9 Replaced loops to create color tables during initialization with statically declared arrays. 2016-08-31 19:36:14 -05:00
Isaac Connor 3f713df826 bump libavutil version check as per @SteveGilvarry 2016-08-09 13:14:10 -04:00
Isaac Connor 177c2c741b Fixes #1584. I've just copied the relevant functions from ffmpeg source. Please review carefully before merging. 2016-08-07 10:55:19 -04:00
Andrew Bauer f67394ffb7 Merge pull request #1567 from SteveGilvarry/avdictparsestring 
Use av_dict_parse_string to create AVDictionary of options
 2016-08-06 09:50:49 -05:00
Andrew Bauer 382896dc0d Merge pull request #1498 from josh4trunks/mysql_port_socket 
Add support for MySQL Port / Unix Socket
 2016-08-06 09:32:32 -05:00
Steve Gilvarry 1a684b7709 Remove whitespace 2016-07-28 23:22:34 +10:00
Steve Gilvarry 71e3789bd0 Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport 2016-07-28 23:15:01 +10:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Andrew Bauer 75a98601ef fix jpeg buffer too small 2016-07-03 14:59:05 -05:00
Andrew Bauer 97baf4ecd3 Merge pull request #1529 from ZoneMinder/fix_1526 
connect needs a +1
 2016-06-24 09:53:46 -05:00
Isaac Connor 472973e975 connect needs a +1 2016-06-12 15:45:24 -04:00
Andrew Bauer f289b84901 move VIDEO_MAX_FRAME up 2016-06-06 19:04:02 -05:00
Andy Bauer 06923d44ba Set VIDEO_MAX_FRAME if it is not defined 2016-06-06 16:27:13 -05:00
Isaac Connor 2385575c56 fix +1 being outside bind() 2016-06-02 16:23:04 -04:00
Andy Bauer d12b9dc16d fix typo. needs } 2016-05-24 09:24:18 -05:00
Andy Bauer 6e82f2c9a9 add messages back with debug 3 2016-05-24 08:50:09 -05:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
josh4trunks 2ab79820a1 Add back changes 2016-05-22 08:08:12 -07:00
Isaac Connor 58d326681a quick fix for gcc6 2016-05-17 09:17:19 -04:00
Isaac Connor 435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Steve Gilvarry 413eced6df Merge pull request #1450 from ZoneMinder/bind_fixes 
add some error checking, but fix the call to bind
 2016-05-10 08:00:10 +10:00
Isaac Connor fd896acd50 Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6 2016-05-06 08:32:21 -04:00
Isaac Connor 341ebc7b45 Merge branch 'master' into bind_fixes 2016-05-02 12:39:55 -04:00
Steve Gilvarry e73935a15b Clean up extraneous avutil include 2016-04-29 21:29:07 +10:00
Steve Gilvarry 8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor 0dc2987b84 add some error checking, but fix the call to bind which really should have a +1 in it. 2016-04-28 16:32:50 -04:00
Isaac Connor fac07cba6d Merge branch 'master' into tabs_to_spaces 2016-04-28 09:31:40 -04:00
Isaac Connor 629f141734 Merge pull request #1441 from SteveGilvarry/remove_commented_code 
Delete large commented out code segment
 2016-04-28 09:30:43 -04:00
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
Steve Gilvarry af361042ef Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string 
use std::string instead of C strings. Mostly this will quiet build wa…
 2016-04-28 22:13:44 +10:00
Steve Gilvarry d9fd0faa32 Merge pull request #1447 from ZoneMinder/simplify_zm_signal 
Simplify zm signal
 2016-04-28 21:37:55 +10:00
Isaac Connor 69d5065ebf move ip down as well 2016-04-26 16:05:37 -04:00
Isaac Connor 5d88acb8a6 re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd 2016-04-26 16:03:26 -04:00
Isaac Connor 7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
abi 9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor 2d8c484792 rotate dimensions when instantiating the Monitor object 2016-04-25 16:48:26 -04:00
Isaac Connor 8c53925fdc redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions. 2016-04-25 16:00:34 -04:00
Isaac Connor 26a45d5fa9 Don't rotate dimensions when constructing the monitor because they are already rotated 2016-04-25 13:55:28 -04:00
Steve Gilvarry 4ca61b7bd8 Removed 180 lines of commented out code that has been hanging around 
in here for a long time.
 2016-04-25 22:12:49 +10:00
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 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00