Isaac Connor
|
c70a9f665a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-20 12:08:16 -05:00 |
|
Isaac Connor
|
dae2a6ae0a
|
fixup the .postinst file which got some duplicate lines
|
2017-11-20 11:56:05 -05:00 |
|
Isaac Connor
|
95c19fa674
|
Make zmaudit check for a pid file and not running if it exists
|
2017-11-20 11:55:42 -05:00 |
|
Isaac Connor
|
74650ebc70
|
simplify Analysis
|
2017-11-20 11:48:56 -05:00 |
|
Isaac Connor
|
64816aa005
|
fixes from cppcheck.
|
2017-11-18 16:00:10 -05:00 |
|
Isaac Connor
|
1abcb19851
|
add Copy routing
|
2017-11-18 09:45:54 -05:00 |
|
Isaac Connor
|
7d77cd75fe
|
eliminate redundant code and memleak
|
2017-11-18 09:45:47 -05:00 |
|
Isaac Connor
|
09a715a99f
|
prevent a warning
|
2017-11-18 09:41:37 -05:00 |
|
Isaac Connor
|
882563c06e
|
rename frame to out_frame. Fix problem where we weren't copying from in_frame to out_frame
|
2017-11-17 18:19:37 -05:00 |
|
Isaac Connor
|
f5f45b3397
|
add Copy
|
2017-11-17 16:50:44 -05:00 |
|
Isaac Connor
|
4217d8ec4d
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-11-17 16:49:31 -05:00 |
|
Isaac Connor
|
28286c7967
|
fix spacing
|
2017-11-17 16:49:28 -05:00 |
Isaac Connor
|
cd596d49e3
|
fix local camera inputstream
|
2017-11-17 16:49:01 -05:00 |
|
Isaac Connor
|
6702b10dee
|
remove redundant code and memory leaks
|
2017-11-17 15:37:26 -05:00 |
|
Isaac Connor
|
ef5e296144
|
some fixes
|
2017-11-17 14:30:38 -05:00 |
|
Isaac Connor
|
159c0a7165
|
moer cppcheck fixes
|
2017-11-17 07:52:26 -05:00 |
|
Isaac Connor
|
22ff831859
|
more cppcheck recommendations
|
2017-11-16 21:21:56 -05:00 |
Isaac Connor
|
6a68987ec3
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-16 17:40:29 -08:00 |
|
Isaac Connor
|
778942b928
|
improve add_monitors
|
2017-11-16 17:39:48 -08:00 |
|
Isaac Connor
|
7bff9a8083
|
fix to compile
|
2017-11-16 20:37:40 -05:00 |
|
Isaac Connor
|
2aa252fbd0
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-16 18:27:44 -05:00 |
|
Isaac Connor
|
0318fb54a6
|
add missing initializers
|
2017-11-16 18:23:02 -05:00 |
|
Isaac Connor
|
7f3d112eb6
|
Merge branch 'tesla' into zma_to_thread
|
2017-11-16 12:07:25 -08:00 |
|
Isaac Connor
|
1686584908
|
more cppcheck fixes
|
2017-11-16 09:19:27 -05:00 |
|
Isaac Connor
|
a956ffe7b3
|
add Copy and =operators to satisfy cppcheck
|
2017-11-16 09:15:04 -05:00 |
|
Isaac Connor
|
d411ed329b
|
get rid of mistyped zmaFPS and zmcFPS
|
2017-11-16 09:14:26 -05:00 |
|
Isaac Connor
|
e23a12b22f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-11-16 09:13:51 -05:00 |
Isaac Connor
|
a95a53d6a6
|
Merge pull request #49 from Toasty27/patch-1
Update zm_create.sql.in
|
2017-11-16 07:21:50 -05:00 |
Daniel Hodgson
|
bfd28dda71
|
Update zm_create.sql.in
Added missing column `AnalysisFPS`
|
2017-11-15 17:59:07 -08:00 |
|
Daniel Hodgson
|
087a902698
|
Update zm_create.sql.in
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
|
2017-11-15 17:44:59 -08:00 |
|
Isaac Connor
|
97be2bf0a3
|
fix events js vars, eliminating doing the sql query twice
|
2017-11-15 13:01:07 -05:00 |
|
Isaac Connor
|
f861cfce59
|
Merge 10.34.100.185:ZoneMinder into zma_to_thread
|
2017-11-14 15:33:51 -08:00 |
|
Isaac Connor
|
cca9fb13cc
|
add FPS to console
|
2017-11-14 15:33:31 -08:00 |
APHW2 MFGENG
|
028aa9f161
|
fix segfault
|
2017-11-14 15:32:37 -08:00 |
|
Isaac Connor
|
55eb78c951
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-14 13:17:55 -08:00 |
|
Isaac Connor
|
bb6e6c18eb
|
add defaults for CaptureFPS and AnalysisFPS
|
2017-11-14 13:17:50 -08:00 |
|
APHW2 MFGENG
|
82b30ef9d0
|
Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread
|
2017-11-14 13:16:58 -08:00 |
|
APHW2 MFGENG
|
93c79efc72
|
test out more options
|
2017-11-14 13:16:56 -08:00 |
|
Isaac Connor
|
3129afa5d6
|
fixup decoding when recording from a non-ffmpeg suorce
|
2017-11-14 13:16:07 -08:00 |
|
APHW2 MFGENG
|
9563c534a9
|
play around with presets
|
2017-11-14 12:41:25 -08:00 |
|
Isaac Connor
|
bac3fbfce9
|
fix compile on old ffmpeg
|
2017-11-14 08:55:00 -08:00 |
|
Isaac Connor
|
da089bf6e6
|
Merge 10.34.100.185:ZoneMinder into zma_to_thread
|
2017-11-14 08:53:51 -08:00 |
|
APHW2 MFGENG
|
b839151cbc
|
only set orientation if doing pssthrough
|
2017-11-14 08:53:29 -08:00 |
|
APHW2 MFGENG
|
1809921b46
|
turnoff debug
|
2017-11-14 08:53:08 -08:00 |
|
Isaac Connor
|
13ca8435ef
|
Don't go looking for Events to update Diskspace for
|
2017-11-14 08:13:54 -08:00 |
|
Isaac Connor
|
2b09658f88
|
fixes, set tune to lowlatency
|
2017-11-14 08:41:45 -05:00 |
|
Isaac Connor
|
d5962b11ff
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:48:38 -05:00 |
|
Isaac Connor
|
57c8cdde63
|
Merge branch 'storageareas' into put_ffmpeg_into_event_wip
|
2017-11-14 02:45:34 -05:00 |
|
Isaac Connor
|
93a4dfa3aa
|
remove extra dropdown addition
|
2017-11-14 02:42:51 -05:00 |
|
Isaac Connor
|
65e7fb0014
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:40:12 -05:00 |