Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread ...

Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php

2018-01-24 11:06:19 -05:00

..

CMakeLists.txt

finish deprecating zma

2017-11-30 15:19:31 -05:00

jinclude.h

Migrate svn to git

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

zm_analysis_thread.cpp

fix int64 = int*int multiply

2017-12-08 15:17:45 -05:00

zm_analysis_thread.h

simplify Analysis

2017-11-20 11:48:56 -05: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

add Copy and =operators to satisfy cppcheck

2017-11-16 09:15:04 -05:00

zm_buffer.cpp

update gpl 2 mailing address in source files

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

zm_buffer.h

more cppcheck fixes

2017-11-16 09:19:27 -05:00

zm_camera.cpp

blah

2017-12-02 13:55:26 -05:00

zm_camera.h

fixup decoding when recording from a non-ffmpeg suorce

2017-11-14 13:16:07 -08:00

zm_comms.cpp

move freeaddrinfo up before a return to prevent memleak

2017-12-12 12:35:05 -05:00

zm_comms.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_config.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_config.h.in

add CFG_UNKNOWN and use it in the .cpp to quiet coverity

2017-12-12 12:35:28 -05:00

zm_coord.cpp

update gpl 2 mailing address in source files

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

zm_coord.h

add Copy and =operators to satisfy cppcheck

2017-11-16 09:15:04 -05:00

zm_curl_camera.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_curl_camera.h

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_db.cpp

change zmDbConnect to return a bool

2017-12-08 10:36:54 -05:00

zm_db.h

change zmDbConnect to return a bool

2017-12-08 10:36:54 -05:00

zm_event.cpp

Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread

2018-01-16 17:53:48 -05:00

zm_event.h

Merge branch 'storageareas' into zma_to_thread

2017-12-19 14:06:58 -05:00

zm_eventstream.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-19 14:06:58 -05:00

zm_eventstream.h

fixes to new Storage Schemes code

2017-12-19 11:01:03 -05: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

simplify logic, improve debugging

2018-01-22 03:26:25 +01:00

zm_ffmpeg_camera.h

blah

2017-12-02 13:55:26 -05:00

zm_ffmpeg_input.cpp

rework

2017-11-20 15:32:40 -05:00

zm_ffmpeg_input.h

rework

2017-11-20 15:32:40 -05:00

zm_ffmpeg_output.cpp

add rouhged in output

2017-10-25 13:27:34 -07:00

zm_ffmpeg_output.h

add rouhged in output

2017-10-25 13:27:34 -07:00

zm_ffmpeg.cpp

fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem.

2018-01-23 18:14:55 +01:00

zm_ffmpeg.h

Merge zm_ffmpeg.cpp from zma_to_thread

2018-01-21 17:18:29 -05:00

zm_file_camera.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_file_camera.h

quiet coverity by initializing everything in constructor

2017-12-12 12:37:36 -05: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

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_image.h

simplify Analysis

2017-11-20 11:48:56 -05:00

zm_jpeg.cpp

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_jpeg.h

spelling fixes

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

zm_libvlc_camera.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_libvlc_camera.h

merge work from zma_to_thread, but not the zma_to_thread part

2017-11-12 11:42:34 -05:00

zm_local_camera.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_local_camera.h

seems to work

2017-12-01 07:26:34 -05:00

zm_logger.cpp

fix local camera inputstream

2017-11-17 16:49:01 -05:00

zm_logger.h

remove unused mDbConnection

2017-12-12 13:18:50 -05:00

zm_mem_utils.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_monitor.cpp

Merge branch 'storageareas' into zma_to_thread

2018-01-18 13:44:26 -05:00

zm_monitor.h

some cleanups/fixes

2017-12-05 13:16:52 -08:00

zm_monitorstream.cpp

Merge branch 'storageareas' into zma_to_thread

2017-11-23 08:40:49 -05:00

zm_monitorstream.h

initialize ttl

2017-12-12 13:19:09 -05:00

zm_mpeg.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_mpeg.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_packet.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-19 14:06:58 -05:00

zm_packet.h

rework locking to have a per-packet mutex

2017-12-03 11:09:01 -05:00

zm_packetqueue.cpp

Merge branch 'storageareas' into zma_to_thread

2018-01-24 11:06:19 -05:00

zm_packetqueue.h

add a mutex to the packetqueue

2017-12-08 10:39:57 -05:00

zm_poly.cpp

update gpl 2 mailing address in source files

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

zm_poly.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_regexp.cpp

initilize things to quiet coverity

2017-12-12 13:09:55 -05: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

some fixes

2017-11-17 14:30:38 -05:00

zm_remote_camera_http.h

merge work from zma_to_thread, but not the zma_to_thread part

2017-11-12 11:42:34 -05:00

zm_remote_camera_nvsocket.cpp

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_remote_camera_nvsocket.h

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_remote_camera_rtsp.cpp

simplify Analysis

2017-11-20 11:48:56 -05:00

zm_remote_camera_rtsp.h

merge work from zma_to_thread, but not the zma_to_thread part

2017-11-12 11:42:34 -05:00

zm_remote_camera.cpp

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_remote_camera.h

wip

2017-11-21 19:55:40 -05:00

zm_rgb.h

update gpl 2 mailing address in source files

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

zm_rtp_ctrl.cpp

moer cppcheck fixes

2017-11-17 07:52:26 -05: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

moer cppcheck fixes

2017-11-17 07:52:26 -05: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

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_rtsp_auth.h

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_rtsp.cpp

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_rtsp.h

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_sdp.cpp

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_sdp.h

moer cppcheck fixes

2017-11-17 07:52:26 -05:00

zm_sendfile.h

finish roughing in ffmpeg_input

2017-06-26 16:55:49 -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_storage.cpp

Set Default Scheme

2018-01-23 09:07:40 -05:00

zm_storage.h

add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE

2017-12-18 12:52:26 -05:00

zm_stream.cpp

fix strncpy calls

2017-12-12 13:42:48 -05:00

zm_stream.h

quiet coverity by initialising last_frame_timestamp

2017-12-12 13:01:57 -05:00

zm_swscale.cpp

some fixes

2017-11-17 14:30:38 -05:00

zm_swscale.h

fixup decoding when recording from a non-ffmpeg suorce

2017-11-14 13:16:07 -08:00

zm_thread.cpp

fix printouts on 32bit

2017-12-01 10:30:58 -05:00

zm_thread.h

initialize mValue

2017-12-12 13:19:35 -05: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

Merge branch 'storageareas' into zma_to_thread

2017-12-12 15:29:19 -05:00

zm_user.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_utils.cpp

simplify Analysis

2017-11-20 11:48:56 -05:00

zm_utils.h

fixes from cppcheck.

2017-11-18 16:00:10 -05:00

zm_video.cpp

switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed.

2017-07-05 13:08:16 -04:00

zm_video.h

add ffmpeg decoding of a .mp4 to get the frames

2017-08-23 15:05:44 -04:00

zm_videostore.cpp

Merge branch 'storageareas' into zma_to_thread

2018-01-24 11:06:19 -05:00

zm_videostore.h

simplify logic, improve debugging

2018-01-22 03:26:36 +01:00

zm_zone.cpp

fixes from cppcheck.

2017-11-18 16:00:10 -05: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

zmc.cpp

Merge branch 'storageareas' into zma_to_thread

2018-01-10 14:24:46 -05:00

zms.cpp

fix strncpy calls

2017-12-12 13:42:48 -05:00

zmu.cpp

cleanup

2017-11-28 11:55:47 -05:00