ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/src
History
Isaac Connor b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 		2016-02-10 09:17:40 -05:00
..
CMakeLists.txt Merge master 2015-12-14 15:49:32 -05:00
Makefile.am Merge branch 'master' into storageareas 2014-11-19 14:11:39 -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 merge master 2015-09-24 10:01:27 -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 Add Debug/Info lines reporting multi-server status 2016-01-26 20:53:34 -05:00
zm_config.h.in Add SERVER_NAME and SERVER_ID loading to config 2015-07-16 10:05:21 -04: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 use new db functions in zm_config.cpp 2015-07-16 16:44:09 -04:00
zm_db.h use new db functions in zm_config.cpp 2015-07-16 16:44:09 -04:00
zm_event.cpp Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
zm_event.h add server_id to event_data 2015-12-15 12:09:45 -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 Migrating from av_free/av_freep to av_frame_free using libavcodec version 2015-11-04 15:30:14 +11:00
zm_ffmpeg.h Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 2015-11-04 12:46:26 +11:00
zm_ffmpeg_camera.cpp ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 2015-11-04 16:24:39 +11:00
zm_ffmpeg_camera.h Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 2015-11-04 12:46:26 +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 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
zm_image.h change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04: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 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 2015-11-04 16:24:39 +11:00
zm_local_camera.h Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 2015-11-04 12:46:26 +11:00
zm_logger.cpp Add ServerId column when inserting log line into database 2015-12-30 08:29:45 -05:00
zm_logger.h strip the path from the filename 2015-08-21 18:28:50 -05:00
zm_mem_utils.h Migrate svn to git 2013-03-17 00:45:21 +01:00
zm_monitor.cpp Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
zm_monitor.h add getStorage method to return the desired Storage Area object 2015-12-15 11:16:51 -05:00
zm_mpeg.cpp Migrating from av_free/av_freep to av_frame_free using libavcodec version 2015-11-04 15:30:14 +11:00
zm_mpeg.h Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 2015-11-04 12:46:26 +11: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 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
zm_remote_camera.h Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
zm_remote_camera_http.cpp codespell: misc. spelling corrections 2016-02-08 20:41:36 +11: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 Reorder RTSPDescribe to avoid -wreorder warnings 2015-11-05 17:19:58 +11:00
zm_remote_camera_rtsp.h Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 2015-11-04 12:46:26 +11: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 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
zm_rtsp.h Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
zm_rtsp_auth.cpp Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
zm_rtsp_auth.h Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11: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_storage.cpp Warning to Debug for Storage class with no Id 2016-01-04 15:21:23 -05:00
zm_storage.h change method from getPath to Path 2015-12-15 12:10:07 -05:00
zm_stream.cpp delete lock when we are done with it 2015-12-04 16:38:24 -05:00
zm_stream.h CMD_QUIT definition 2016-01-29 10:00:02 -05: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 change method from getPath to Path 2015-12-15 13:27:18 -05:00
zm_zone.h Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
zma.cpp Do not call time() function when it is not necessary 2015-07-25 13:46:11 +02:00
zmc.cpp Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
zmf.cpp Merge branch 'master' into storageareas 2016-02-10 09:17:40 -05: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