8c298b96d0
Merge pull request #1820 from SteveGilvarry/Remove_arg_r
...
Remove zmc -r argument as it does not seem to be implemented.
2017-04-15 07:17:56 -05:00
6b0f587725
invert timestamp_on_capture condition
2017-04-13 15:51:50 -05:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
b609b9ad4c
Merge pull request #1826 from connortechnology/uri_decode_in_zms
...
Uri decode in zms
2017-04-03 20:13:30 -05:00
184eb507a7
zm_local_camera.cpp: Improve format strings
...
This avoids printing '0x0' as char and hence terminating the output too
early.
2017-03-29 12:45:44 +02:00
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
e5b18ee213
Remove zmc -r argument as it does not seem to be implemented.
2017-03-18 23:25:14 +11:00
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
7f059b750f
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:46 -05:00
87daba346b
fix else behaviour by adding braces
2017-01-11 14:18:56 -05:00
c0e929f136
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
2017-01-11 09:11:27 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
6fa3b25d2a
fix whitespace
2016-12-12 21:44:03 -05:00
1f6a6f9758
fix whitespace
2016-12-12 21:43:07 -05:00
9b76a16af4
log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert
2016-12-12 21:41:55 -05:00
873bb9902b
recalculating zmswap at this point is unnesessary
2016-11-19 08:53:17 -06:00
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
006fcad10a
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:35:14 -04: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
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
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
f1acc52913
spellcheck/codespell
2016-07-14 00:30:39 +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
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
Andrew Bauer
Isaac Connor
Michael Schupikov
Isaac Connor
SteveGilvarry
Qu Wenruo
Andrew Bauer
klemens
Andy Bauer
Isaac Connor
Isaac Connor
Matt Durant
Isaac Connor
Dmitry Smirnov
josh4trunks