df5a238857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:14:50 -04:00
0a1b2eab01
Merge branch 'uri_decode_in_zms' into storageareas
2017-03-20 15:13:19 -04:00
f5dc896a45
missed one case
2017-03-20 15:12:23 -04:00
7b8ff44163
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:04:54 -04:00
816b0a9e01
add getsockopt test
2017-03-20 15:04:05 -04:00
a546c9e37f
merge uri_decode in zms
2017-03-20 12:00:14 -04: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
b041e299fc
Merge branch 'adam900710-compile_fix' into storageareas
2017-03-17 09:41:42 -04:00
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -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
3f7583ebda
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-06 16:22:25 -05:00
a97941edd3
change level from error to debug on message about not supporting non-FLTP
2017-02-16 13:30:34 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
808d070414
don't copy smCodes, just get a pointer to it.
2017-02-14 11:29:43 -05:00
4ca2bcacde
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-13 17:02:59 -05:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
aae4a1f83b
remove extraneous setting of NULL to videowriter which is already NULL
2017-02-04 11:20:21 -05:00
f73bf0aee0
add a cast to fix compilation with clang
2017-02-02 12:43:13 -05:00
1102f449aa
don't do extra copy of classString
2017-02-02 09:22:13 -05:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
61827fec0c
remove redundant mkdir eventdir.
2017-01-18 09:31:08 -05:00
7116d66500
use the correct pointer casts
2017-01-16 21:57:21 -05:00
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
19bc79a5ec
move nRet into the block where it is used. Add a comment.
2017-01-16 21:11:28 -05:00
f6d1707382
fix event insert
2017-01-16 21:08:13 -05:00
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
c5ad62b9fc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 14:24:58 -05:00
29acad163c
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
2017-01-15 14:24:50 -05:00
b7ee64ff41
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 13:35:45 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
babe4f07fb
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-14 10:53:49 -05:00
21c1e1d26f
add a call to av_interleaved_write_Frame to clear out the queues in the destructor
2017-01-13 14:37:18 -05:00
251264ac92
bump ffmpeg version required to use codecpar
2017-01-11 14:31:30 -05:00
7f059b750f
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:46 -05:00
23b40da598
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:12 -05:00
8653822bff
cleanup av_packet_unref/free_packet by using our zm_av_packet_unref
2017-01-11 14:22:37 -05:00
87daba346b
fix else behaviour by adding braces
2017-01-11 14:18:56 -05:00
0d5910644e
whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be.
2017-01-11 14:18:11 -05:00
5d03e9f50e
Merge branch 'fix_1743_Edimax' into storageareas
2017-01-11 10:34:08 -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
dccd1e9732
fix
2017-01-05 13:54:34 -05:00
71ad08613e
fix
2017-01-05 11:30:01 -05:00
d1ed472db0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-05 10:09:11 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -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
Isaac Connor
Isaac Connor
Isaac Connor
Qu Wenruo
Andrew Bauer
klemens
Andy Bauer