64d5f180c8
add Disconnect to Close
2018-05-26 13:03:13 -04:00
34111251d9
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
2018-04-17 07:02:52 -07:00
b123bd1da3
remove uneccessary zm_packetqueue.h
2017-05-20 09:12:05 -04:00
ecb57f8f04
change bool recording to a timeval.
2017-04-12 13:40:17 -04:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
d1bcb14629
Right direction
2016-09-01 00:00:10 +10:00
44df4a830d
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
2016-08-11 20:44:48 +10:00
1277f3c792
need arpa/inet for reverse lookups
2016-08-10 12:32:58 -04:00
0abfb7378a
Buffer work
2016-05-18 00:01:33 +10:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
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
af7a49d8d0
Change comments for many Camera subclasses so that comments match the subclass.
2014-01-27 16:52:46 -08:00
c61029f780
First iteration of h264 saving in the capture daemon.
...
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
2013-09-06 15:07:46 +12:00
dde584a12a
Restructured camera capture methods somewhat and revamped V4L stuff a bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 09:48:06 +00:00
e6041e24a7
Uppdated copyright headers
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
f6a029bc4d
Updated properties
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2608 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:08:15 +00:00
d598f54210
Merged in V4L2 initial changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2582 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:20:52 +00:00
aa26ab7b18
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:35:59 +00:00
Isaac Connor
Isaac Connor
Isaac Connor
Andy Bauer
Steve Gilvarry
Isaac Connor
Kevin Dalley
Chris Wiggins
stan