3afa8937d8
calculate string lengths and array ndx's properly
2016-11-19 08:52:22 -06:00
d3a7fca079
only unlink if zmc is being destroyed
2016-11-14 19:01:00 -06:00
6c7d71361a
unlink the mmap file when the monitor object is destroyed
2016-11-13 16:40:54 -06:00
a2f782d61a
Merge branch 'master' into feature-h264-videostorage
2016-11-03 16:26:18 -04:00
006fcad10a
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:35:14 -04:00
a7979eb63b
Merge branch 'master' into feature-h264-videostorage
2016-10-03 13:21:50 -04:00
6be3938ae1
Ignore bad decodes
2016-09-26 22:36:53 +10:00
5722f3af2f
fix audio_stream to audio_st
2016-09-21 14:01:32 -04:00
249d3cadc5
fix for video on stream 1
2016-09-21 12:17:09 -04:00
288b03290c
remark out some debugging
2016-09-21 09:05:55 -04:00
59b28e8346
deprecate the z_frame_rate stuff which is deprecated in ffmpeg
2016-09-13 10:15:47 -04:00
39e06b929f
add braces and only call closeEvent if there is an event
2016-09-13 09:36:45 -04:00
fc060135fe
Move our recording flag deeper into closeevent
2016-09-13 22:58:38 +10:00
dfb06fd548
Merge pull request #1607 from mattdurant/fix_issue_1460
...
Fix issue #1460
2016-09-01 14:02:13 -04:00
350352d956
Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1.
2016-08-31 20:56:30 -05:00
0950ecbcb9
Replaced loops to create color tables during initialization with statically declared arrays.
2016-08-31 19:36:14 -05:00
1277f3c792
need arpa/inet for reverse lookups
2016-08-10 12:32:58 -04:00
6ac1a70b9c
Merge my Rotation/Orientation work and fixes for bad h264 streams
2016-08-10 12:22:04 -04:00
5d8159462c
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-11 00:51:46 +10:00
3f713df826
bump libavutil version check as per @SteveGilvarry
2016-08-09 13:14:10 -04:00
177c2c741b
Fixes #1584 . I've just copied the relevant functions from ffmpeg source. Please review carefully before merging.
2016-08-07 10:55:19 -04:00
f67394ffb7
Merge pull request #1567 from SteveGilvarry/avdictparsestring
...
Use av_dict_parse_string to create AVDictionary of options
2016-08-06 09:50:49 -05:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
ea1ae815f1
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-05 23:03:06 +10:00
1a684b7709
Remove whitespace
2016-07-28 23:22:34 +10:00
71e3789bd0
Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport
2016-07-28 23:15:01 +10:00
b9a48eb464
Pass swscale_ctx back in to getCachedContext or it will create new
...
context every frame and leak memory like a mofo.
2016-07-17 08:11:53 +10:00
f1acc52913
spellcheck/codespell
2016-07-14 00:30:39 +10:00
b05eabfe1d
Forgot that I was trying to solve case of stream is true and record_audio
...
is false.
2016-07-13 08:31:10 +10:00
f1b9e1205a
Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
2016-07-12 23:13:02 +10:00
5d2ece0063
Why are these failing
2016-07-10 11:57:08 +10:00
25f7a8cadf
Restore lost fixes for deprecation
2016-07-09 22:31:01 +10:00
142784746c
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-07-07 19:33:04 +10:00
75a98601ef
fix jpeg buffer too small
2016-07-03 14:59:05 -05:00
97baf4ecd3
Merge pull request #1529 from ZoneMinder/fix_1526
...
connect needs a +1
2016-06-24 09:53:46 -05:00
7496dc392f
get rid of use of separator, just use \n
2016-06-21 14:06:07 -04:00
dfc885a12a
fix tabs
2016-06-21 12:25:13 -04:00
d8f6cc952d
Fix missing } from merge that was preventing building.
2016-06-19 07:22:14 +10:00
08c8da3e8f
fix extra else and some whitespace
2016-06-17 11:37:20 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
472973e975
connect needs a +1
2016-06-12 15:45:24 -04:00
f289b84901
move VIDEO_MAX_FRAME up
2016-06-06 19:04:02 -05:00
06923d44ba
Set VIDEO_MAX_FRAME if it is not defined
2016-06-06 16:27:13 -05:00
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
d12b9dc16d
fix typo. needs }
2016-05-24 09:24:18 -05:00
6e82f2c9a9
add messages back with debug 3
2016-05-24 08:50:09 -05:00
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
58d326681a
quick fix for gcc6
2016-05-17 09:17:19 -04:00
435a1f7a2e
remove duplicated locking code created by bind_fixes
2016-05-17 09:11:52 -04:00
413eced6df
Merge pull request #1450 from ZoneMinder/bind_fixes
...
add some error checking, but fix the call to bind
2016-05-10 08:00:10 +10:00
fd896acd50
Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6
2016-05-06 08:32:21 -04:00
341ebc7b45
Merge branch 'master' into bind_fixes
2016-05-02 12:39:55 -04:00
b9a6273f32
Fix dropped part of sql query.
2016-05-01 15:59:53 +10:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
e73935a15b
Clean up extraneous avutil include
2016-04-29 21:29:07 +10:00
8452c4bce5
Fix tab to spaces merge issues
2016-04-29 21:27:28 +10:00
0dc2987b84
add some error checking, but fix the call to bind which really should have a +1 in it.
2016-04-28 16:32:50 -04:00
fac07cba6d
Merge branch 'master' into tabs_to_spaces
2016-04-28 09:31:40 -04:00
629f141734
Merge pull request #1441 from SteveGilvarry/remove_commented_code
...
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
24e3306955
master master
2016-04-28 09:20:56 -04:00
af361042ef
Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string
...
use std::string instead of C strings. Mostly this will quiet build wa…
2016-04-28 22:13:44 +10:00
d9fd0faa32
Merge pull request #1447 from ZoneMinder/simplify_zm_signal
...
Simplify zm signal
2016-04-28 21:37:55 +10:00
69d5065ebf
move ip down as well
2016-04-26 16:05:37 -04:00
5d88acb8a6
re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd
2016-04-26 16:03:26 -04:00
7d7249f328
use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows
2016-04-26 15:48:21 -04:00
9aff84fbbb
unbreak build under FreeBSD 32 bit II
2016-04-26 21:53:50 +03:00
2d8c484792
rotate dimensions when instantiating the Monitor object
2016-04-25 16:48:26 -04:00
8c53925fdc
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
2016-04-25 16:00:34 -04:00
26a45d5fa9
Don't rotate dimensions when constructing the monitor because they are already rotated
2016-04-25 13:55:28 -04:00
4ca61b7bd8
Removed 180 lines of commented out code that has been hanging around
...
in here for a long time.
2016-04-25 22:12:49 +10:00
e4f116af2f
more debug and comments, return checking
2016-04-15 15:32:48 -04:00
b3e68ca2f7
Must init videoStore in constuctor
2016-04-15 15:10:26 -04:00
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
28b30ecb47
Merge pull request #1377 from ZoneMinder/random_fixes
...
Random fixes
2016-04-11 12:04:05 -05:00
fefa2dc804
add a test and error message if the codec is not h264
2016-04-06 12:48:16 -04:00
d83ab4d46c
Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
2016-04-06 11:25:05 -04:00
2f1376950a
spelling fix
2016-04-06 10:50:12 -04:00
9aeba8ced8
whitespace fixes
2016-04-06 10:50:00 -04:00
0ef02287dd
revert
2016-04-06 10:49:42 -04:00
222f7755fe
fix whitespace
2016-04-06 10:27:41 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
ecce87b779
mamke status a member so that we aren't return the address of a local variable
2016-03-31 14:43:22 -04:00
a16c1746e5
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
1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
b6ee4e4228
move return up into #ifdef.
2016-03-24 09:43:15 -04:00
0c32ae61ef
Merge branch 'master' into fix_coverity_issues
2016-03-24 09:42:01 -04:00
bfd846bbff
Add more logging to diagnose problems with applying ffmpeg options
2016-03-20 21:44:58 +00:00
5f4441878e
Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already.
2016-03-03 17:16:06 +11:00
2122d6e443
Fix all the av_picture related deprecations
2016-03-03 01:03:55 +11:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
23d437ab47
ffmpeg 3.0 API build failure fixes
2016-02-27 02:12:22 +11:00
e70d037895
Start avpicture deprecation
2016-02-27 01:23:20 +11:00
0277a66700
Remove eyezm from distros and Cmake.
...
Conflicts:
distros/debian8/control
2016-02-26 22:41:27 +11:00
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
5b047dc74b
zm_event: fix overlap in memcpy buffers
2016-02-20 23:58:36 +02:00
6f221ed269
Merge pull request #1278 from schrorg/bigfont-license
...
Added script to generate src/zm_bigfont.h
2016-02-16 09:17:54 -05:00
6332f28c53
zm_monitor: fix overlap in memcpy buffers
...
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
2016-02-16 11:47:49 +02:00
e8c38dd016
demoted to debug due to lots of logs
2016-02-11 15:12:21 -05:00
f5ef721ebd
Add IP6 address type to valid types for ConnInfo
2016-02-10 17:53:00 +01:00
226b77bb63
Added script to generate src/zm_bigfont.h
...
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
904f584fcb
CMD_QUIT definition
2016-01-29 10:00:02 -05:00
38bca6b95d
added CMD_QUIT to kill zms via command
2016-01-29 09:58:57 -05:00
47b2cdbb96
added CMD_QUIT to kill zms via command
2016-01-29 09:58:50 -05:00
f275498790
Add Debug for sql used to load other than local monitors
2016-01-26 21:00:32 -05:00
902065a6c1
Add Debug for sql used to load local monitors
2016-01-26 20:59:07 -05:00
3a0b28f168
Add Debug/Info lines reporting multi-server status
2016-01-26 20:53:34 -05:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
f357ea6ccd
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-28 11:53:04 -05:00
ccded54937
put back missing col++
2015-12-28 11:52:40 -05:00
3f1c782ff7
Fix random extra semicolon
2015-12-28 16:29:04 +11:00
e76cc59bad
revert whitespace changes
2015-12-21 13:42:44 -05:00
36f83aa412
revert whitespace changes
2015-12-21 13:35:17 -05:00
609ab79f81
revert whitespace changes
2015-12-21 13:32:57 -05:00
1fee421500
revert whitespace changes
2015-12-21 13:29:41 -05:00
c0a79567e6
revert whitespace changes
2015-12-21 13:26:24 -05:00
fdf1912ec1
revert whitespace changes
2015-12-21 13:11:18 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
af9fc1de90
revert white space changes.
2015-12-21 12:57:05 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
af76d19646
Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555.
2015-12-18 01:47:10 +11:00
688ee7f103
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 16:41:26 -05:00
0fc68e2e91
delete lock when we are done with it
2015-12-04 16:38:24 -05:00
be36301779
use exclusive lock, add includes
2015-12-04 16:35:27 -05:00
6d605362fc
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 15:39:51 -05:00
e637915823
add a lock around the socket creating/deleting.
2015-12-04 15:39:37 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
a9609d2a43
fix mem alloc fault in zm_monitor.cpp
2015-11-21 12:17:23 -06:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
6002f251c0
Add FFMPEGInit back
2015-11-05 19:36:11 +11:00
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +11:00
44f63443c1
video branch ffmpeg 2.9 fixes
...
ffmpeg 2.9 patched removed SSE2 CPU
2015-11-04 14:43:45 -08:00
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
4c773472bd
Add support for IPv6 in RTSP code
...
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
2015-11-04 16:41:47 +01:00
5423be9eb8
Revert space removal around PRId64
2015-11-05 01:25:44 +11:00
5b68656602
Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
2015-11-05 01:09:39 +11:00
1c479a01f2
Fix PRId64 issue in travis, another try
2015-11-05 00:34:48 +11:00
078dc85548
Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
2015-11-04 22:52:47 +11:00
dc0506c597
Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
2015-11-04 22:33:29 +11:00
5ba13f1a76
ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected
...
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
2015-11-04 16:24:39 +11:00
51914994f7
Migrating from av_free/av_freep to av_frame_free using libavcodec version
...
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
2015-11-04 15:30:14 +11:00
bc5ef6c599
Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
...
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
2015-11-04 12:46:26 +11:00
0ff7a4e616
Replace deprecated FFmpeg API
...
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
2015-11-03 11:58:23 +11:00
17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
650d93435e
Remove syslog.h
2015-10-30 21:42:58 +11:00
6e2e33cf89
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
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
44cda8032b
Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall
2015-10-24 20:07:42 -04:00
ac8d9fe76a
Merge pull request #1118 from liucougar/fix_crash_in_ubuntu1404
...
feature-h264-videostorage - Fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc…
2015-10-23 22:24:26 +11:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
fee883f61a
fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
...
when libx264 is not installed
2015-10-22 22:52:41 -07:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
ac8bfc71dc
fix specifying ServerId
2015-10-02 18:22:48 +00:00
6ff4e333b4
Merge branch 'fix_warnings' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-10-02 15:34:05 +00:00
7b253bcd7e
Debug line
2015-10-02 15:28:51 +00:00
24b79e81bc
add include for basename on freebsd
2015-10-02 11:00:42 -04:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
4a978034ad
Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults
...
Fix sgfault caused by the privacy mask stuff
2015-09-16 10:46:45 -05:00
b8f2b1e0a0
Merge branch 'mmap_fd_gt_3' into multi-server
2015-09-16 11:01:06 -04:00
d991912ce4
Merge branch 'fix_privacy_mask_segfaults' into multi-server
2015-09-16 11:00:57 -04:00
e70d49b033
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
2015-09-16 10:58:57 -04:00
6e12febf3d
initialize privacy_bitmask and check it before deletep[] to prevent segfault
2015-09-16 10:51:27 -04:00
0571ca3025
quick fix for #1055 : make sure our mmap fd is > 2
2015-09-16 09:11:22 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
09e5463a81
test for value in server_id before atoi
2015-08-27 11:16:58 -04:00
bca9a19488
tabs to spaces
2015-08-27 11:14:00 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
d1343df920
Change colour of privacy zones from black to dark grey
2015-08-26 07:45:45 +02:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
14feffc455
strip the path from the filename
2015-08-21 18:28:50 -05:00
22dc049bf4
remove Info statement used for testing
2015-08-21 10:34:23 -05:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
Andy Bauer
Isaac Connor
Steve Gilvarry
Isaac Connor
Matt Durant
Isaac Connor
Dmitry Smirnov
Andrew Bauer
josh4trunks
abi
Jon Burgess
Kaarle Ritvanen
arjunrc
Robin Daermann
Isaac Connor
SteveGilvarry
Heng Liu
inflex
baffo32
Linwood-F