Commit Graph

12617 Commits

Author SHA1 Message Date
Isaac Connor 9f8be169f9 set channels and sample rate in output frame. Use new zm_dump_frame() 2019-01-14 10:48:29 -05:00
Isaac Connor a46b443d4a create zm_dump_frame to print out useful frame info. 2019-01-14 10:48:06 -05:00
Isaac Connor d0cca01c4c setup url instead of filename in the AVFormatContext to satisfy filename being deprecated 2019-01-14 10:47:53 -05:00
Isaac Connor c97eb16942 create zm_dump_frame to print out useful frame info. 2019-01-14 10:47:22 -05:00
Isaac Connor fc7403fe3d Merge branch 'master' into storageareas 2019-01-13 14:53:34 -05:00
Isaac Connor c834fbe462 the filter action should singular filter, not filters 2019-01-13 14:52:39 -05:00
Isaac Connor ee2b9b011a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-11 13:55:17 -05:00
Isaac Connor a282b487d1 load Help from Config as it is not longer always loaded into ram. 2019-01-11 13:55:03 -05:00
kobold81 208d8f28de update debian to 1.32.x (#2407)
Hello,

the ZM_PATH config has cost me several hours to fix. I would like to add this little snipped to help others avoid this pitfall.

Best regards
Marc
2019-01-11 12:14:42 -05:00
Isaac Connor 730ced60d8 specify which input we are setting standard on. Not sure it is required, but the api docs do it 2019-01-10 12:08:51 -05:00
Isaac Connor b373577589 fix function view after actions cleanup 2019-01-10 12:08:25 -05:00
Isaac Connor 4a82f460b2 add some parenthesis to make logic at more clear if not more correct. Potentially fix #2405 2019-01-09 16:39:53 -05:00
Isaac Connor 1d54216e80 spacing 2019-01-09 16:23:58 -05:00
Isaac Connor 941ce6e97f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-09 12:37:54 -05:00
Isaac Connor c1e4fbac6a extend input path and options to the full width of the popup 2019-01-09 12:37:42 -05:00
Andrew Bauer 9811679cc0
Merge pull request #2401 from connortechnology/vlc_logging
add a logging callback to the libvlc camera
2019-01-08 13:49:51 -06:00
Isaac Connor 2d03583b78 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-08 13:12:42 -05:00
Isaac Connor ffa37d8c10 Fix margins on replayControl 2019-01-08 13:12:35 -05:00
Isaac Connor a5de51478e The termination callback should be private 2019-01-08 13:12:22 -05:00
Isaac Connor ae1f00f2a1 add a logging callback to the libvlc camera 2019-01-08 13:06:19 -05:00
Andrew Bauer dd4bd42066
Merge pull request #2396 from connortechnology/fix_2383
disable delete button when event is archived.
2019-01-07 18:40:05 -06:00
Isaac Connor 3f5a2a2aa6 disable delete button when event is archived. 2019-01-07 15:56:23 -05:00
Isaac Connor f3a807f1f8 Merge branch 'master' into storageareas 2019-01-07 09:21:25 -05:00
Isaac Connor b8bf91bec6 include libswresample-ffmpeg1 in depends 2019-01-07 09:20:58 -05:00
Isaac Connor b4f8500cb5 Merge branch 'split_actions' 2019-01-05 18:33:04 -05:00
Isaac Connor 3f10553464 Fix include path to Monitors.php 2019-01-05 18:32:53 -05:00
Isaac Connor 1a75cf333e Merge branch 'master' into storageareas 2019-01-05 11:12:38 -05:00
Isaac Connor e34a5e972a fix missing } 2019-01-05 11:12:26 -05:00
Isaac Connor cf0d55d3db Merge branch 'master' into storageareas 2019-01-05 10:59:01 -05:00
David Beitey e6ba8e58ef Fix #2391 by defining monitor variable (#2392) 2019-01-05 10:20:34 -05:00
Isaac Connor 8eb61b1c11 Merge branch 'master' into storageareas 2019-01-05 10:16:38 -05:00
Isaac Connor c4c6d5b642 switch to swr_convert_frame as a test 2019-01-05 10:15:22 -05:00
Andrew Bauer 7336cdaf0d
Update ISSUE_TEMPLATE.md 2019-01-05 08:29:58 -06:00
Andrew Bauer 16f272e3e0
Update issue templates 2019-01-05 08:21:52 -06:00
Andrew Bauer 986961d1d4
Create issue-close-app.yml 2019-01-05 08:14:39 -06:00
Andrew Bauer 4678456fe5
Merge pull request #2385 from connortechnology/split_actions
Split actions.php into individual files per view
2019-01-04 17:33:57 -06:00
Isaac Connor 5b5905c83a We always use markEids[] now 2019-01-04 16:29:16 -05:00
Isaac Connor de0ef6ce43 Merge branch 'master' into split_actions 2019-01-04 15:55:54 -05:00
Isaac Connor e72e4e7ce4 Spacing, remove some html4 stuff, clean up duplicated hidden form elements. 2019-01-04 15:52:36 -05:00
Isaac Connor dea64320f0 Fix a + that should be a . 2019-01-04 15:52:14 -05:00
Isaac Connor 0e20666992 fix eventdetail actions being in events 2019-01-04 15:43:31 -05:00
Isaac Connor ab198bfd75 remove master version of actions.php 2019-01-04 15:29:21 -05:00
Isaac Connor 52466c398b Merge branch 'split_actions' into storageareas 2019-01-04 15:28:55 -05:00
Isaac Connor b8d065275b Merge branch 'master' into storageareas 2019-01-04 15:22:18 -05:00
Isaac Connor e2f32ab091 Upgrade config saving 2019-01-04 09:43:36 -05:00
Isaac Connor 7ec96655c3 fix missing ! when testing for permission on editing config 2019-01-04 09:37:26 -05:00
Isaac Connor 5b9bf48945 Merge branch 'master' into split_actions 2019-01-04 09:35:54 -05:00
Isaac Connor 46adcbb66b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-04 09:34:51 -05:00
Isaac Connor edeaa07c12 Fix no quotes around Id 2019-01-04 09:34:42 -05:00
Isaac Connor 6cad852e11 fix path to MontageLayout 2019-01-04 09:34:18 -05:00