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

8688 Commits

Author SHA1 Message Date
Kyle Johnson 4ad7baf8f9 packpack - fix encrypted key 2017-04-17 13:05:16 -06:00
Kyle Johnson 5904e9b703 packacpk - update encrypted rsa file 2017-04-17 12:55:04 -06:00
Andrew Bauer 008624451f Merge pull request #1856 from connortechnology/remove_BOM 
use dos2unix to remove BOM
 2017-04-17 08:32:17 -05:00
Andrew Bauer 24c50ea7bd Merge pull request #1832 from mastertheknife/cmake_pod2man_outofsource 
Fix out-of-source building failing because pod2man
 2017-04-17 07:45:42 -05:00
Andrew Bauer cea31f205a Update zoneminder.tmpfiles.in 
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
 2017-04-16 20:44:41 -05:00
Isaac Connor a164118ad3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-16 11:26:30 -04:00
Isaac Connor 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor 3b2d708a16 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-04-16 11:24:51 -04:00
Isaac Connor d5fd4b43a5 experiment with zmDbDisconnect before forking 2017-04-16 11:24:37 -04:00
Isaac Connor f1f54205fb Merge branch 'remove_BOM' into storageareas 2017-04-16 09:28:35 -04:00
Isaac Connor 5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Kfir Itzhak 71e6735b60 Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions 
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
 2017-04-16 10:57:37 +03:00
Andy Bauer f10d3f10a0 packpack - add full path to deply_rsa.enc 2017-04-15 09:36:53 -05:00
Andy Bauer 3b1ef579d5 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-04-15 09:24:45 -05:00
Andy Bauer 4240f03f4e rpm readmefile changes 2017-04-15 09:23:28 -05:00
Isaac Connor 0efca38d68 Merge pull request #1854 from knnniggett/caketmp 
make cake tmp = zoneminder tmp
 2017-04-15 10:23:03 -04:00
Isaac Connor 432a38720a Merge pull request #1788 from knnniggett/travis_test1 
packpack nightly builds
 2017-04-15 10:21:42 -04:00
Andrew Bauer 7e9b9944ae rpmspecfile changes to reflect recent commits 2017-04-15 08:51:59 -05:00
Andrew Bauer 65f96df477 Merge pull request #1791 from dwalkes/FI8908ControlAdd 
Additional controls for FI8908W cameras
 2017-04-15 07:23:29 -05:00
Andrew Bauer 8c298b96d0 Merge pull request #1820 from SteveGilvarry/Remove_arg_r 
Remove zmc -r argument as it does not seem to be implemented.
 2017-04-15 07:17:56 -05:00
Isaac Connor ab4b5e6b69 Merge pull request #1853 from knnniggett/cakecache 
change cake cache engine from File -> Apc
 2017-04-14 21:10:23 -04:00
Isaac Connor 5dd4359b80 Merge pull request #1852 from knnniggett/cakelog 
move cake log to zoneminder log folder
 2017-04-14 21:09:50 -04:00
Andrew Bauer 0b729cf295 modify cmakelists.txt 2017-04-14 15:15:29 -05:00
Andrew Bauer d2490cf7e3 make cake tmp = zoneminder tmp 2017-04-14 15:11:41 -05:00
Andrew Bauer 48a73f7e78 change cache engine from File -> Apc 2017-04-14 14:31:42 -05:00
Andrew Bauer 3cbd32cd41 move cake log to zoneminder log folder 2017-04-14 14:24:29 -05:00
Andrew Bauer 48e2c5f6ec Update redhat.rst 2017-04-14 12:40:32 -05:00
Isaac Connor 09d8d7e40f Merge pull request #1851 from knnniggett/timestamponcapture 
invert timestamp_on_capture condition
 2017-04-14 11:05:04 -04:00
Andrew Bauer a6799a8aaa remove unneeded files 2017-04-14 06:40:09 -05:00
Andrew Bauer 6b0f587725 invert timestamp_on_capture condition 2017-04-13 15:51:50 -05:00
Isaac Connor a5e7db0f7c use faster ffmpeg method to generate frame image 2017-04-13 12:35:14 -04:00
Isaac Connor 0bbe5d19a6 add libavresample to build depends 2017-04-13 09:59:35 -04:00
Isaac Connor d8e27fe01a Merge ../release/zoneminder_0.30.13~20170412162034-trusty.orig into storageareas 2017-04-13 09:48:56 -04:00
Isaac Connor f6067ab969 undo c++11 requirements 2017-04-13 09:47:47 -04:00
Isaac Connor 83219d3e34 define av_frame_free to av_freep on older ffmpeg. Undo c++11 requirements. 2017-04-13 09:47:19 -04:00
Isaac Connor b03d0d09da fix typo 2017-04-13 09:08:15 -04:00
Isaac Connor 9027c0ee06 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-12 16:20:09 -04:00
Isaac Connor c9482d8ae8 add extra quotes where neccessary, fix the release case 2017-04-12 16:20:04 -04:00
Isaac Connor 7d6505f015 use Delta to grab frame from video, using -ss for speed 2017-04-12 16:17:19 -04:00
Isaac Connor f97e074393 braces fixes 2017-04-12 16:16:56 -04:00
Isaac Connor d1f04a60f9 fix errors calculating dts 2017-04-12 16:16:37 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor e28be26978 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-04-12 13:41:16 -04:00
Isaac Connor 6e7bd9311d add the api tmp cache folders to the tmpfiles 2017-04-12 13:41:02 -04:00
Isaac Connor 51d5bfc8d5 introduce a helper function to print out a timeval 2017-04-12 13:40:38 -04:00
Isaac Connor ecb57f8f04 change bool recording to a timeval. 2017-04-12 13:40:17 -04:00
Isaac Connor 575b3138de change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames 2017-04-12 13:39:47 -04:00
Isaac Connor a0b57cedeb change bool recording to a timeval. and add GetPreEventCount 2017-04-12 13:39:12 -04:00
Isaac Connor e3d3fc3411 change bool recording to a timeval. 2017-04-12 13:38:56 -04:00
Isaac Connor 59c85c1fbb change bool recording to a timeval. 2017-04-12 13:38:39 -04:00