0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
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
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
e9044b436d
Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
2013-12-19 19:21:30 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
8944531f75
Added cURL checks to cmake
2013-11-04 16:57:22 +02:00
bb5b936ad3
Fixed a bug with HAVE_LIBAVDEVICE_AVDEVICE_H in cmake
2013-10-10 14:04:00 +03:00
022ecf4227
Merge pull request #201 from ZoneMinder/signalfixes
...
Signal improvements and fixes
2013-10-07 08:45:12 -07:00
6847e9016e
Fix ZM_NO_MMAP cmake option
2013-10-07 15:06:26 +03:00
1d7f664627
1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext)
...
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
2013-10-07 10:37:58 +03:00
b5c536b134
Signal and backtrace improvements
2013-10-06 18:26:33 +03:00
f043c6e955
Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements
2013-10-03 15:08:09 +03:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
Kfir Itzhak
Edward Barnard