Isaac Connor
|
666233af54
|
fix mving capture_file_format to staticCOnfig
|
2017-10-18 20:46:26 -04:00 |
|
Isaac Connor
|
98590b99f8
|
Merge branch 'storageareas' into work_on_zms
|
2017-09-04 14:35:02 -04:00 |
|
Isaac Connor
|
d11313e6bc
|
fix build
|
2017-09-01 18:03:34 -04:00 |
|
Isaac Connor
|
ed6ff23c2f
|
Merge branch 'storageareas' into work_on_zms
|
2017-09-01 17:53:59 -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
|
676c4b7ddc
|
Merge branch 'master' into storageareas
|
2017-08-22 09:52:14 -04:00 |
|
Isaac Connor
|
087b7abb94
|
Merge branch 'master' into fix_event_viewing
|
2017-08-14 10:41:04 -04:00 |
|
Isaac Connor
|
9fa48954db
|
more work
|
2017-07-18 22:30:22 -04:00 |
|
Isaac Connor
|
24a8915699
|
Merge debug statements into 1
|
2017-07-11 08:30:44 -04:00 |
|
Isaac Connor
|
d3ec50aa69
|
various fixes plus use global db functions in logger
|
2017-07-06 17:45:23 -04:00 |
|
Isaac Connor
|
323aedde4e
|
fix merge
|
2017-07-06 12:41:15 -04:00 |
|
Isaac Connor
|
2a71b0f170
|
Merge branch 'storageareas' into work_on_zms
|
2017-07-06 12:39:44 -04:00 |
|
Isaac Connor
|
62d6394923
|
finish roughing in ffmpeg_input
|
2017-06-26 16:55:49 -04:00 |
Isaac Connor
|
24dd3a8c66
|
fix loading starttime of event
|
2017-06-26 11:20:10 -04:00 |
|
Isaac Connor
|
b73c0ba978
|
rough in zm_ffmpeg_input and split out eventstream
|
2017-06-22 17:58:32 -04:00 |
|
Isaac Connor
|
c241b6dddd
|
Merge branch 'split_zmeventstream' into storageareas
|
2017-06-22 10:46:32 -04:00 |
|
Isaac Connor
|
394001604d
|
add the new files for EventStream
|
2017-06-22 10:12:04 -04:00 |