ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,284 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor ddb7305aab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-02 09:11:55 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor eb390c323e Merge branch 'storageareas' into ffmpeg_321 2017-04-11 11:14:23 -04:00
Isaac Connor 620797ac18 replace swresample with libavresample 2017-04-10 21:54:23 -04:00
Isaac Connor f19b3d5505 create zm_packet 2017-02-18 15:22:56 -05:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Steve Gilvarry 02013cef94 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue 2016-05-03 21:15:46 +10:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
SteveGilvarry 966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Isaac Connor aa516dd575 undo the multi-line 2016-03-31 11:24:27 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake. 
Conflicts:
	distros/debian8/control
 2016-02-26 22:41:27 +11:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
baffo32 44cda8032b Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall 2015-10-24 20:07:42 -04:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Isaac Connor 8b2f67c456 don't include .cpp in man 2015-07-13 11:30:32 -04:00
Andy Bauer 561bf43721 fix pod2man generation for out-of-source builds 2015-07-09 19:33:06 -05:00
Andrew Bauer fa835359a1 Add install target for C binary man pages 2015-06-20 17:33:13 -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
Andrew Bauer 4cb8cf8681 remove commented commands 2015-04-12 11:48:49 -05:00
Andrew Bauer 3a3f186e74 update working_directory 2015-04-12 11:48:18 -05:00
Andrew Bauer 8f337999d4 remove nph-zms target 2015-04-12 11:47:28 -05:00
Andrew Bauer 3108fd2109 link nph-zms rather than build 2015-04-12 11:00:43 -05:00
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
 2014-12-02 20:58:35 +11:00
Isaac Connor 69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05:00
Isaac Connor 70c63bd394 Merge branch 'master' into storageareas 
Conflicts:
	db/zm_create.sql.in
	distros/debian/control
	distros/ubuntu1204/changelog
	src/CMakeLists.txt
	src/zm_config_defines.h
	src/zm_monitor.h
 2014-11-19 14:11:39 -05:00
m-bene 32f05ada86 add digest auth file for cmake 
Conflicts:
	src/CMakeLists.txt
 2014-10-13 16:51:21 +11:00
stevegilvarry 189f6cba54 Add zm_videostore.cpp to CMakeLists.txt 2014-05-30 13:31:49 +10:00
m-bene e25420efaa add digest auth file for cmake 2014-04-29 17:31:06 +02:00
Kfir Itzhak 0d7c52dc1f Merge remote branch 'origin/master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-04-17 13:26:00 +03:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Kfir Itzhak e652441996 Merge remote-tracking branch 'origin/master' into video 
Conflicts:
	configure.ac
	src/CMakeLists.txt
 2013-12-26 21:03:45 +02:00
Kfir Itzhak 89cfb96855 Merge pull request #277 from ebarnard/libvlc 
Add libVLC source type
 2013-12-22 13:01:19 -08:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Isaac Connor 8bd8e326bc add storage 2013-12-13 13:45:00 -05:00
Kfir Itzhak c1970a51e3 Fix few errors and syntax errors regarding curl 2013-11-04 17:10:07 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00