15 Commits

Author	SHA1	Message	Date
Isaac Connor	57a53f6fdd	spacing and fixes	2017-11-09 15:03:23 -05:00
Isaac Connor	b54d340bda	google code style fix	2017-10-24 16:10:16 -07:00
Isaac Connor	666233af54	fix mving capture_file_format to staticCOnfig	2017-10-18 20:46:26 -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	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