Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage

2016-04-01 08:53:45 -04:00

..

CMakeLists.txt

Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage

2015-10-28 08:12:46 +11:00

jinclude.h

Migrate svn to git

2013-03-17 00:45:21 +01:00

Makefile.am

Merge branch 'video' into feature-h264-videostorage

2014-12-02 20:58:35 +11:00

zm_bigfont.h

Added script to generate src/zm_bigfont.h

2016-02-10 11:28:56 +01: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

Whitespace fix zm_camera.h

2014-12-19 07:27:25 +11: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

demoted to debug due to lots of logs

2016-02-11 15:12:21 -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

Putting placeholder in for CaptureAndRecord function

2014-06-30 21:56:13 +10:00

zm_curl_camera.h

Add CaptureandRecord from zm_camera.h

2014-06-30 21:25:49 +10: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 feature-h264-videostorage

2016-04-01 08:53:45 -04:00

zm_event.h

Remove extraneous file

2015-07-23 19:37:23 -04: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_camera.cpp

Merge branch 'master' into feature-h264-videostorage

2016-04-01 08:53:45 -04:00

zm_ffmpeg_camera.h

Merge branch 'master' into feature-h264-videostorage

2015-11-04 14:39:52 -08:00

zm_ffmpeg.cpp

Merge branch 'master' into feature-h264-videostorage

2015-11-04 14:39:52 -08:00

zm_ffmpeg.h

Add FFMPEGInit back

2015-11-05 19:36:11 +11:00

zm_file_camera.cpp

Migrate svn to git

2013-03-17 00:45:21 +01:00

zm_file_camera.h

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10:00

zm_font.h

Migrate svn to git

2013-03-17 00:45:21 +01: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_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_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

Add CaptureAndRecord to vlc, still need to make it record

2014-10-23 19:56:35 +11:00

zm_libvlc_camera.h

Add CaptureAndRecord to vlc, still need to make it record

2014-10-23 19:56:35 +11: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

Merge branch 'master' into feature-h264-videostorage

2015-11-04 14:39:52 -08: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 feature-h264-videostorage

2016-04-01 08:53:45 -04:00

zm_monitor.h

Merge branch 'master' into feature-h264-videostorage

2016-04-01 08:53:45 -04: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_http.cpp

codespell: misc. spelling corrections

2016-02-08 20:41:36 +11:00

zm_remote_camera_http.h

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10: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

Merge branch 'master' into feature-h264-videostorage

2015-11-04 14:39:52 -08: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

Merge branch 'master' into feature-h264-videostorage

2015-12-20 14:13:30 +11:00

zm_rgb.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_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_rtsp_auth.cpp

move return up into #ifdef.

2016-03-24 09:43:15 -04: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_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_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

separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value

2016-03-24 10:00:02 -04: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_video.cpp

ffmpeg 3.0 API build failure fixes

2016-02-27 02:12:22 +11:00

zm_video.h

ffmpeg 3.0 API build failure fixes

2016-02-27 02:12:22 +11:00

zm_videostore.cpp

Revert space removal around PRId64

2015-11-05 01:25:44 +11:00

zm_videostore.h

Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file

2015-10-30 19:05:40 +10:00

zm_zone.cpp

Renamed 'Blacken' zone type to 'Privacy'

2015-08-20 17:37:59 +02:00

zm_zone.h

Renamed 'Blacken' zone type to 'Privacy'

2015-08-20 17:37:59 +02: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

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

codespell: misc. spelling corrections

2016-02-08 20:41:36 +11: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