Commit Graph

9452 Commits

Author SHA1 Message Date
Isaac Connor a5079f205e add Manufacturers and Models Tables 2017-08-25 15:35:17 -04:00
Isaac Connor 11b29bf1ec Fixup ONVIF module, making it actually usable 2017-08-25 11:16:37 -04:00
Isaac Connor 08bdf5a729 fix build on trusty 2017-08-24 12:19:57 -04:00
Isaac Connor 2a4f751a4f ffmpeg versionc heck 2017-08-24 12:00:48 -04:00
Isaac Connor 0c24556611 fix missing ! 2017-08-24 10:59:56 -04:00
Isaac Connor d11a2947bb use Id instead of id 2017-08-24 10:44:14 -04:00
Isaac Connor 2daae43760 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-24 10:14:00 -04:00
Isaac Connor 48e9e12063 assume source=monitor when a monitor_id is specified 2017-08-24 10:13:46 -04:00
Isaac Connor 789de37d33 fix builds on older ffmpeg 2017-08-24 09:53:40 -04:00
Isaac Connor a4cf47b5c3 move swscale into it's own files 2017-08-23 15:06:12 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 5c13ae26e3 Merge branch 'storageareas' into work_on_zms 2017-08-23 10:43:19 -04:00
Isaac Connor 732ebf6df4 shorted some variable names and correct spacing 2017-08-23 10:37:32 -04:00
Isaac Connor eb5cee7f3e use ifdef around uses of AV_CODEC_ID_H265 and fix google code style 2017-08-23 10:14:06 -04:00
Isaac Connor e98ea0b891 fix non hwaccel build 2017-08-22 10:47:37 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor 9a6bfb2d02 fix some quotes, double to single 2017-08-22 09:44:45 -04:00
Isaac Connor 40cc13a903 fix whitespace 2017-08-22 09:34:02 -04:00
Isaac Connor 9b95259567 fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id 2017-08-22 09:33:51 -04:00
Andrew Bauer 160641563f packpack - add missing $parms var 2017-08-21 18:50:30 -05:00
Andrew Bauer 52603b24c0 Update .travis.yml
Add 32bit centos builds using my docker repo
2017-08-21 13:35:57 -05:00
Andrew Bauer 613bbfb65b arm neon-check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect (#1966)
* arm neon - check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect

* skip arm neon check it not on linux
2017-08-21 12:02:28 -04:00
Andrew Bauer ac5d1738ea allow changing of the timestamp char code delimeter (#1972) 2017-08-21 11:27:11 -04:00
jethornton 431ec3ea75 Update faq.rst (#1970)
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
Isaac Connor a534a9e5a9 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-21 11:03:47 -04:00
Isaac Connor cf8560b648 fix duration if it's negative 2017-08-21 10:15:56 -04:00
Andrew Bauer 5030254ba0 build f26 packages with my docker repo
The packpack project does not provide a fedora 26 docker image so I made my own.
2017-08-20 20:12:18 -05:00
Andrew Bauer dc1aa2b670 Update redhat.rst 2017-08-19 21:41:19 -05:00
Andrew Bauer 7d0531ccdd Update packpack.rst 2017-08-19 21:37:04 -05:00
Andrew Bauer e749866101 Update packpack.rst 2017-08-19 21:17:06 -05:00
Andrew Bauer 20b0a26bc5 Update startpackpack.sh 2017-08-19 20:59:30 -05:00
Andrew Bauer ccb7e08aae remove extra whitespace 2017-08-19 20:58:26 -05:00
Andrew Bauer 25c19198f6 packpack - relax the requirements for repoquery 2017-08-19 20:57:41 -05:00
Andy Bauer 7ceb88866c packpack - put pack redhat specific packpack parms 2017-08-19 17:47:06 -05:00
Andy Bauer 4e61f2f55a packpack - don't filter output when we aren't in travis 2017-08-19 17:17:18 -05:00
Andy Bauer a191486c18 packpack - update rpm fusion download url 2017-08-19 16:56:17 -05:00
Andrew Bauer 54f780e2d3 Update redhat.rst 2017-08-19 13:15:11 -05:00
Andrew Bauer 4ccca556e1 Update packpack.rst 2017-08-19 12:52:21 -05:00
Andrew Bauer 52accd7ff5 Update packpack.rst 2017-08-19 12:50:07 -05:00
Andrew Bauer 9172a1bc42 Update packpack.rst 2017-08-19 12:48:57 -05:00
Andrew Bauer e473806fff Update packpack.rst 2017-08-19 12:47:41 -05:00
Andrew Bauer 8bf395465f Update packpack.rst 2017-08-19 12:46:38 -05:00
Andrew Bauer 65f03ce613 Update packpack.rst 2017-08-19 12:46:00 -05:00
Andrew Bauer 7ed53f766e Update packpack.rst 2017-08-19 12:45:39 -05:00
Andrew Bauer 7a1208daaa Update packpack.rst 2017-08-19 12:43:28 -05:00
Andrew Bauer 4adad745d0 Update packpack.rst
fix bullets
2017-08-19 12:42:44 -05:00
Andy Bauer dafe125ed5 initial commit to add packpack build instructions 2017-08-19 12:39:54 -05:00
Andy Bauer 76b9a9dc01 build non-el6 rpms from rpm fusion rather than zmrepo 2017-08-19 09:07:32 -05:00
Isaac Connor 6e24eb6462 use find_one ins tead of New when loading event to determine if event still exists in db 2017-08-18 09:28:14 -04:00
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04:00