0e7f475ce8
merge work from zma_to_thread, but not the zma_to_thread part
2017-11-12 11:42:34 -05:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
13273cb50f
rmeove unneeded include
2017-05-19 15:13:42 -04:00
ecb57f8f04
change bool recording to a timeval.
2017-04-12 13:40:17 -04: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
55c6e5a6db
cleanup putting packetqueue in the monitor. It should be in the camera
2016-08-31 11:47:42 -04: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
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
af76d19646
Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555.
2015-12-18 01:47:10 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
9eda71570a
merge the rest of my Digest-AUth fixes: This should solve #399
2014-11-20 10:44:31 -05:00
0b5a0df7dc
implement http_Digest Auth, and improve it for rtsp
...
Conflicts:
src/zm_remote_camera_http.cpp
src/zm_rtsp.cpp
2014-11-20 10:33:58 -05: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
eff58367b4
IPv6 improvements
2013-11-22 15:30:05 +02:00
e35c541715
Update zm_remote_camera.h
2013-10-11 14:24:23 +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
3c10237833
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-28 08:47:59 +00: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
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
7ad5388fc3
Bug 265 - Fixed memory access errors due to pointers to free'd mysql query data.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1849 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-21 17:58:46 +00:00
d4e16016ba
Bug 264 - Added support for zipped raw images.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1847 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-20 15:27:48 +00:00
a6fca601a2
Bug 263 - Support raw image input.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1846 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-20 15:20:07 +00:00
235dde1a80
Updated copyright statement.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 10:56:30 +00:00
ab2d99160e
Bug 104 - Monitors can now read images from disk files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1522 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 21:55:02 +00:00
978aeb5505
Added memory utility functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1455 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-06-12 17:06:58 +00:00
f03079af6e
None regexp netcan support.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1405 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-14 14:40:17 +00:00
264c23d687
Updated copyright statement
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 14:40:14 +00:00
aff2ef8430
Added persistent brightness etc feature.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1114 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-09-25 16:37:41 +00:00
15d7058f39
Rewrote remote camera capture code and now handles motion jpeg streams.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@946 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-13 14:07:57 +00:00
593f85fd90
Merged in remote authentication feature.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@848 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-02-15 19:17:38 +00:00
b5d6859bd4
Added orientation and tidied up a bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@529 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-05-02 15:03:16 +00:00
d1fd5c0828
Changed colours to palettes and now supports YUV420P.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@471 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-04-12 16:17:17 +00:00
0767828431
News files created as a result of breaking out the classes to support
...
the use of remote cameras.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@409 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 11:57:29 +00:00
Isaac Connor
Isaac Connor
Andy Bauer
Isaac Connor
Steve Gilvarry
SteveGilvarry
Kfir Itzhak
guotie
Chris Wiggins
stan