Isaac Connor 52f1e2d235 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

2017-06-23 10:11:52 -04:00

..

CMakeLists.txt

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

jinclude.h

Migrate svn to git

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

snprintf.cpp

Migrate values from Options -> Paths to zm.conf (#1908)

2017-06-12 21:39:37 -04:00

zm_bigfont.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_box.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_box.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_buffer.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_buffer.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_camera.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_comms.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_comms.h

move include <sys/uio.h> outside defined(BSD) block (#1919)

2017-06-13 15:39:12 -04:00

zm_config.cpp

Migrate values from Options -> Paths to zm.conf (#1908)

2017-06-12 21:39:37 -04:00

zm_config.h.in

Migrate values from Options -> Paths to zm.conf (#1908)

2017-06-12 21:39:37 -04:00

zm_coord.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_coord.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_curl_camera.cpp

Merge branch 'feature-h264-videostorage'

2017-05-16 13:37:24 -04:00

zm_curl_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_db.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_db.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_event.cpp

fix runstate merge

2017-06-13 21:18:09 -04:00

zm_event.h

add missing video_file

2017-05-19 14:43:59 -04:00

zm_exception.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_exception.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_ffmpeg_camera.cpp

Fix version checks to fix build on yaketty

2017-06-15 13:02:54 -04:00

zm_ffmpeg_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_ffmpeg.cpp

Fix version checks to fix build on yaketty

2017-06-15 13:02:54 -04:00

zm_ffmpeg.h

Fix version checks to fix build on yaketty

2017-06-15 13:02:54 -04:00

zm_file_camera.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_file_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_font.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image_analyser.cpp

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image_analyser.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_image.h

Added ARM Neon AArch64 versions of delta

2017-05-13 09:19:13 +03:00

zm_jpeg.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_jpeg.h

spelling fixes

2016-12-29 10:31:05 +01:00

zm_libvlc_camera.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_libvlc_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_local_camera.cpp

Upstream FreeBSD patches (#1926)

2017-06-22 10:14:24 -04:00

zm_local_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_logger.cpp

change mode of opening log files to append instead of overwrite

2017-06-14 10:15:08 -04:00

zm_logger.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_mem_utils.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_monitor.cpp

Migrate values from Options -> Paths to zm.conf (#1908)

2017-06-12 21:39:37 -04:00

zm_monitor.h

introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event.

2017-06-13 17:05:37 -04:00

zm_mpeg.cpp

whitespace/braces, also ffmpeg deprecation handling

2017-05-20 08:52:24 -04:00

zm_mpeg.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_packet.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_packet.h

Upstream FreeBSD patches (#1926)

2017-06-22 10:14:24 -04:00

zm_packetqueue.cpp

add Debug, and fix logic deleting frames before the appropriate keyframe

2017-05-31 20:44:43 -04:00

zm_packetqueue.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_poly.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_poly.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_regexp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_regexp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_remote_camera_http.cpp

merge SA. braces/whitespace debugging

2017-05-20 09:01:32 -04:00

zm_remote_camera_http.h

braces

2017-05-20 09:53:35 -04:00

zm_remote_camera_rtsp.cpp

braces

2017-05-20 09:53:35 -04:00

zm_remote_camera_rtsp.h

braces

2017-05-20 09:53:35 -04:00

zm_remote_camera.cpp

Merge ../ZoneMinder.connortechnology

2017-05-20 09:55:06 -04:00

zm_remote_camera.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_rgb.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_ctrl.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_ctrl.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_data.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_data.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_source.cpp

braces

2017-05-20 09:03:04 -04:00

zm_rtp_source.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp_auth.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp_auth.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp.cpp

fix whitespacing causing a warning when compiling. In this case braces are not neccessary.

2017-01-11 14:25:46 -05:00

zm_rtsp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sdp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sdp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sendfile.h

whitspace

2017-06-22 09:55:45 -04:00

zm_signal.cpp

Upstream FreeBSD patches (#1926)

2017-06-22 10:14:24 -04:00

zm_signal.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_stream.cpp

Migrate values from Options -> Paths to zm.conf (#1908)

2017-06-12 21:39:37 -04:00

zm_stream.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_thread.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_thread.h

spelling fixes

2016-12-29 10:31:05 +01:00

zm_threaddata.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_time.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_time.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_timer.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_timer.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_user.cpp

add more debug

2017-06-08 13:44:22 -04:00

zm_user.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_utils.cpp

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_utils.h

Fix videostorage (#1885)

2017-05-16 12:04:56 -04:00

zm_video.cpp

fix cpplint.py complaints

2017-06-22 16:06:31 -04:00

zm_video.h

Feature h264 videostorage (#1882)

2017-05-15 22:02:48 -04:00

zm_videostore.cpp

Fix version checks to fix build on yaketty

2017-06-15 13:02:54 -04:00

zm_videostore.h

don't init converted_input_samples

2017-06-06 15:57:42 -04:00

zm_zone.cpp

fix form of delete used

2017-06-14 10:54:21 -04:00

zm_zone.h

fix merge

2017-06-09 14:19:31 -04:00

zm.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zma.cpp

add a cast to quiet compiler warning

2017-05-30 10:31:02 -04:00

zmc.cpp

braces

2017-05-20 08:57:53 -04:00

zms.cpp

Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon

2017-05-10 07:45:58 -05:00

zmu.cpp

fix braces

2017-05-31 13:55:21 -04:00