Isaac Connor
|
a9e72288f6
|
add -safe 0 to ffmpeg command line option so that it will generate the concat file
|
2017-07-11 16:11:52 -04:00 |
|
Isaac Connor
|
7a85e22bfc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-06-28 16:22:16 -04:00 |
|
Isaac Connor
|
90696331a9
|
Merge branch 'master' into storageareas
|
2017-06-26 21:58:11 -04:00 |
|
Isaac Connor
|
92c25dc58c
|
Merge branch 'master' into storageareas
|
2017-06-23 10:43:46 -04:00 |
|
Isaac Connor
|
25b66e9629
|
whitespace mostly.
|
2017-06-23 09:58:54 -04:00 |
|
Isaac Connor
|
c33b8a8780
|
fix SQL query that gets the event
|
2017-05-05 17:52:56 -04:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
6129732e61
|
restore the behaviour where the generated file names are printed to stdout.
|
2016-07-11 08:01:43 -04:00 |
Isaac Connor
|
8eac8a1e1a
|
Merge branch 'master' into storageareas
|
2016-07-13 09:50:30 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
409545b386
|
Add concat to the usage line and format it better
|
2016-05-30 14:08:38 -04:00 |
|
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Kyle Johnson
|
b9085cea64
|
Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
|
2016-03-11 14:28:16 -07:00 |
Isaac Connor
|
f32344c647
|
Add output options to the concat cmd line
|
2015-12-23 09:33:33 -05:00 |
|
Isaac Connor
|
b32ef7751b
|
implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.
|
2015-12-17 14:36:40 -05:00 |
SteveGilvarry
|
9b06b1399c
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
|
2015-06-10 23:09:30 +10:00 |
Dmitry Smirnov
|
b0909a4c57
|
autouse Data::Dumper
|
2015-04-16 15:48:51 +10:00 |
|
Dmitry Smirnov
|
7ba03132fc
|
zmvideo.pl: pod2usage + readability
|
2015-04-16 15:48:48 +10:00 |
|
SteveGilvarry
|
79c82ea880
|
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
|
2015-02-17 23:16:42 +11:00 |
|
Isaac Connor
|
7f934e0e69
|
Add version to the usage line in zmvideo.pl
|
2015-01-07 09:11:07 -05:00 |
stevegilvarry
|
33090f2264
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
configure.ac
src/zm_config_defines.h
src/zm_ffmpeg.h
web/index.php
|
2014-05-30 01:55:24 +10:00 |
|
Isaac Connor
|
48a6dcf5ce
|
Change COnfig from using the subroutine symbol table to just using a global hash
|
2013-12-16 16:32:02 -05:00 |
|
Kyle Johnson
|
5f4ff5c7cf
|
Return the full path to the generated video
|
2013-09-19 09:53:20 -04:00 |
stan
|
5c2149e319
|
Fixed incorrectly quoted patterns to split
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3504 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-08-25 20:45:32 +00:00 |
|
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
|
stan
|
11a1cc2d41
|
Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-06-08 09:11:56 +00:00 |