zoneminder/src
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp
Conflicts:
	CMakeLists.txt
	configure.ac
	version
2015-08-17 13:42:36 +02:00
..
CMakeLists.txt don't include .cpp in man 2015-07-13 11:30:32 -04:00
Makefile.am Merge pull request #407 from m-bene/rtspDigest 2014-10-11 17:39:57 -05:00
jinclude.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm.cpp More signal improvements: 2013-10-07 02:37:50 +03:00
zm.h Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
zm_bigfont.h Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
zm_box.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_box.h Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 2015-05-17 17:18:54 -07:00
zm_buffer.cpp Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
zm_buffer.h Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
zm_camera.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_camera.h cURL is now working! 2013-12-27 18:02:32 +02:00
zm_comms.cpp Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 2015-05-17 17:18:54 -07:00
zm_comms.h ifdef's for BSD and cleanup 2015-01-02 17:07:49 -05:00
zm_config.cpp Fix memory leaks in zmLoadConfig 2014-11-15 13:32:43 +01:00
zm_config.h.in Apply INSERTs in Event::AddFrames in batches to avoid excessive query length 2013-10-26 18:41:12 -07:00
zm_coord.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_coord.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_curl_camera.cpp Minor corrections to cURL code 2014-06-06 09:35:02 +03:00
zm_curl_camera.h Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
zm_db.cpp add some utility db functions 2015-07-16 13:04:28 -04:00
zm_db.h add some utility db functions 2015-07-16 13:04:28 -04:00
zm_event.cpp use frame_type instead of score in conditional 2015-08-14 07:03:08 -05:00
zm_event.h rework prev and next buttons 2014-03-28 17:18:34 -05:00
zm_exception.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_exception.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_ffmpeg.cpp Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_ffmpeg.h Readd checking of micro version in zm_mpeg.cpp to fix compilation issue 2015-05-29 19:23:00 +02:00
zm_ffmpeg_camera.cpp Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_ffmpeg_camera.h - join reconnect thread when finished to clean up thread resources. 2014-10-12 16:31:27 +11:00
zm_file_camera.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_file_camera.h Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
zm_font.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_image.cpp Removed untranslated "Font size" from language files, corrected white 2015-08-10 15:35:19 +02:00
zm_image.h Removed untranslated "Font size" from language files, corrected white 2015-08-10 15:35:19 +02:00
zm_image_analyser.cpp Doing my best to manually remove nextime's plugin architecture while keeping his other changes. 2013-08-13 09:43:23 -04:00
zm_image_analyser.h Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
zm_jpeg.cpp Update zm_jpeg.cpp 2014-05-04 02:35:17 +02:00
zm_jpeg.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_libvlc_camera.cpp change examples for options 2014-05-17 21:48:08 +02:00
zm_libvlc_camera.h add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
zm_local_camera.cpp Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_local_camera.h include libv4l1-videodev headers 2015-04-03 18:24:51 -05:00
zm_logger.cpp Change from info to debug 2015-08-03 18:39:14 -04:00
zm_logger.h Close logger and database on exit 2014-11-14 22:17:44 +01:00
zm_mem_utils.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_monitor.cpp Add label size to monitor options (database and backend part) 2015-08-10 15:35:18 +02:00
zm_monitor.h Add label size to monitor options (database and backend part) 2015-08-10 15:35:18 +02:00
zm_mpeg.cpp Readd checking of micro version in zm_mpeg.cpp to fix compilation issue 2015-05-29 19:23:00 +02:00
zm_mpeg.h - render video using double buffers 2014-04-26 18:25:48 +02:00
zm_poly.cpp Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 2015-05-17 17:18:54 -07:00
zm_poly.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_regexp.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_regexp.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_remote_camera.cpp merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
zm_remote_camera.h merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
zm_remote_camera_http.cpp Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
zm_remote_camera_http.h Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
zm_remote_camera_rtsp.cpp Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_remote_camera_rtsp.h Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
zm_rgb.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp_ctrl.cpp Add some comments, change log level of some debug lines. Don't die on a timeout. 2015-01-30 09:44:10 -05:00
zm_rtp_ctrl.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp_data.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp_data.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_rtp_source.cpp Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements 2014-10-11 15:38:38 -05:00
zm_rtp_source.h Support streaming with zms (using ffmpeg) better 2014-04-25 22:12:58 +02:00
zm_rtsp.cpp typo fix 2015-06-22 09:26:17 -04:00
zm_rtsp.h Fix memory leaks with rtsp and a bug 2014-11-14 22:31:03 +01:00
zm_rtsp_auth.cpp add missing + 2015-02-04 14:22:53 -05:00
zm_rtsp_auth.h merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
zm_sdp.cpp Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_sdp.h Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
zm_sendfile.h sendfile tricks 2015-02-24 09:20:55 -05:00
zm_signal.cpp Fix to compile on 32bit kFreeBSD 2015-04-24 13:55:10 -04:00
zm_signal.h 1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext) 2013-10-07 10:37:58 +03:00
zm_stream.cpp only do mmap on demand 2014-06-26 14:54:47 -04:00
zm_stream.h Now can recive RTSP stream. 2013-09-27 15:08:11 +04:00
zm_thread.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_thread.h Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 2015-05-17 17:18:54 -07:00
zm_threaddata.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_time.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_time.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_timer.cpp Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_timer.h Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 2015-05-17 17:18:54 -07:00
zm_user.cpp Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
zm_user.h match up #if's regarding gnutls-openssl 2013-04-29 16:44:37 -04:00
zm_utils.cpp Add a stringVector join function for future use 2014-11-05 14:01:48 -05:00
zm_utils.h Add a stringVector join function for future use 2014-11-05 14:01:48 -05:00
zm_zone.cpp whitespace issue 2014-08-21 11:14:38 -04:00
zm_zone.h add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
zma.cpp Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
zmc.cpp Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
zmf.cpp fix utf8 ' characters 2015-07-15 10:37:08 -04:00
zmf.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zms.cpp Make zms not crash when zmc is not running. 2015-02-22 16:58:15 -05:00
zmstreamer.cpp Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
zmu.cpp fix utf8 ' characters 2015-07-15 10:37:08 -04:00