Commit Graph

10110 Commits

Author SHA1 Message Date
Isaac Connor b1019267d8 try moving codec selection up above ctx allocation so that it allocates a priv_data 2017-12-02 08:12:04 -05:00
Isaac Connor 0ef9d13dbd Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-01 18:50:46 -05:00
Isaac Connor 3ca9b36877 fixes to compile on old ffmpeg 2017-12-01 18:50:28 -05:00
Isaac Connor b87e459125 still corrupting memory 2017-12-01 14:48:30 -05:00
Isaac Connor 2e3fda488e more debug 2017-12-01 14:33:51 -05:00
Isaac Connor cbae7ef7b4 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-12-01 10:33:15 -05:00
Isaac Connor 128ae82331 add a debug for when in addpacket and no videostore 2017-12-01 10:33:10 -05:00
Isaac Connor 6e17bfefdd fix printouts on 32bit 2017-12-01 10:30:58 -05:00
Isaac Connor 0865201e1e seems to work 2017-12-01 07:26:34 -05:00
Isaac Connor 967368ce07 testing 2017-11-30 22:18:33 -05:00
Isaac Connor 4e26bde140 merge fix 2017-11-30 22:18:02 -05:00
Isaac Connor 4130c73943 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-11-30 19:26:58 -05:00
Isaac Connor 4cc5838c66 whitespace & cleanup 2017-11-30 19:26:51 -05:00
Isaac Connor 556c4d8851 debug 2017-11-30 16:10:30 -05:00
Isaac Connor c52d7c60eb finish deprecating zma 2017-11-30 15:19:31 -05:00
Isaac Connor 84c901a01b don't write non-frames 2017-11-30 15:01:48 -05:00
Isaac Connor f2efc80f22 works? 2017-11-30 14:37:36 -05:00
Isaac Connor cb70a3627f Fixes to montagereview and only load event data when in History mode 2017-11-28 14:50:21 -05:00
Isaac Connor 344539f5dc cleanup 2017-11-28 11:55:47 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor 1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor 6e4abf83d0 wip 2017-11-28 08:29:03 -05:00
Isaac Connor dfb69a2c5b Merge branch 'tesla' into storageareas 2017-11-28 06:29:42 -05:00
Isaac Connor db5cf998ad Turn off debug 2017-11-27 15:43:21 -05:00
Isaac Connor 9d91d4ce45 relocate code for readability 2017-11-27 15:43:16 -05:00
Isaac Connor 81fa201910 init last_signal 2017-11-27 15:43:06 -05:00
Isaac Connor 9f57c819cd Merge branch 'tesla' into zma_to_thread 2017-11-27 14:57:38 -05:00
Isaac Connor d1886b5536 wip 2017-11-27 14:57:24 -05:00
Isaac Connor 00c5590a71 add Monitor count to servers 2017-11-27 11:56:48 -08:00
Isaac Connor c2ff010d27 Support NULL in date/time values 2017-11-27 10:04:08 -08:00
Isaac Connor 106351a9f3 don't get zma status 2017-11-27 11:57:42 -05:00
Isaac Connor 81c46073a7 remove some brackets 2017-11-27 11:57:08 -05:00
Isaac Connor 99968dfa2a Merge branch 'storageareas' into zma_to_thread 2017-11-27 11:28:36 -05:00
Isaac Connor 03c9f88d55 fix build on trusty 2017-11-27 08:24:14 -05:00
Isaac Connor 7c491bf62e make compile on trusty 2017-11-26 18:06:12 -05:00
Isaac Connor fc27674d76 can't do init in the if statement 2017-11-26 17:50:57 -05:00
Isaac Connor 428d923874 make StatusFIlter do something 2017-11-26 17:39:49 -05:00
Isaac Connor 39e490e5e5 fix monitor dropdown 2017-11-26 17:32:41 -05:00
Isaac Connor 4fbdacef05 fix event counts 2017-11-26 17:03:36 -05:00
Isaac Connor dd3f9492ba fix dulicate logic 2017-11-26 15:12:35 -05:00
Isaac Connor 4a884afecb need the update file 2017-11-26 15:08:12 -05:00
Isaac Connor d6bc727c9c use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array 2017-11-26 11:12:00 -05:00
Isaac Connor b1bb0020d3 turn off database debug 2017-11-24 15:42:44 -05:00
Isaac Connor 8a40a613bf bump version 2017-11-24 15:42:20 -05:00
Isaac Connor c0e49b65ef stop writing env to /tmp/env 2017-11-24 15:38:07 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 7e3328fbb8 add styles to the html5 button element 2017-11-24 09:36:45 -05:00
Isaac Connor a9f0f3813a Merge branch 'tesla' into storageareas 2017-11-24 09:31:00 -05:00
Isaac Connor 07907b5c1c Change from Warning to Debug 2017-11-24 09:28:24 -05:00
Isaac Connor 900fbe1e0f update save to a button tag, and add a saveas functionality 2017-11-23 08:26:55 -08:00