Isaac Connor
0e40897e02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-05 14:24:09 -04:00
Isaac Connor
8569c7523a
fix braces
2017-07-05 14:11:58 -04:00
Isaac Connor
2bc679e65e
if a 0 scale is given, default to 100%
2017-07-05 14:11:17 -04:00
Isaac Connor
834d1dddfa
fix braces
2017-07-05 14:10:09 -04:00
Isaac Connor
121aba0308
add parenthesis around truth value to quieten compiler
2017-06-29 15:41:21 -04:00
Isaac Connor
52f1e2d235
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-23 10:11:52 -04:00
Isaac Connor
fcc852c859
fix cpplint.py complaints
2017-06-22 16:06:31 -04:00
abishai
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
Isaac Connor
1bba664e3d
whitspace
2017-06-22 09:55:45 -04:00
Isaac Connor
8527e5f1de
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-15 13:03:09 -04:00
Isaac Connor
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
Isaac Connor
3dc9594461
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 11:24:54 -04:00
Isaac Connor
07a2d49a41
Merge branch 'log_no_truncate'
2017-06-14 11:23:39 -04:00
Isaac Connor
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
Isaac Connor
b51d885f66
fix build on old ffmpeg
2017-06-14 10:36:08 -04:00
Isaac Connor
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
Isaac Connor
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
Isaac Connor
dd70eb3e5f
more deprecation fixes
2017-06-13 17:06:50 -04:00
Isaac Connor
42100d9a33
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
Isaac Connor
3c053b36ef
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
2017-06-13 16:51:51 -04:00
Andrew Bauer
417421b1d8
move include <sys/uio.h> outside defined(BSD) block ( #1919 )
2017-06-13 15:39:12 -04:00
Andrew Bauer
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
Andrew Bauer
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
781d49dfb1
fix merge
2017-06-09 14:19:31 -04:00
Isaac Connor
162cc05a33
when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this.
2017-06-09 11:05:44 -04:00
Isaac Connor
f8cb0a5e21
Merge branch 'master' into add_was_alarmed
2017-06-09 10:46:01 -04:00
Isaac Connor
d7b291f933
add more debug
2017-06-08 13:44:22 -04:00
Isaac Connor
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
Isaac Connor
070f0d5d62
don't init converted_input_samples
2017-06-06 15:57:42 -04:00
Isaac Connor
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
Isaac Connor
7d97267dd2
fix compile on old ffmpeg
2017-06-06 15:35:17 -04:00
Andrew Bauer
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor
457a3273b1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:05:28 -04:00
Isaac Connor
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
Isaac Connor
7ae0b4a546
handle older versions of ffmpeg
2017-06-03 10:13:39 -04:00
Isaac Connor
eeefb2c8e2
need previous_pts and dts for both video and audio. I don't think they can share
2017-06-02 16:53:14 -04:00
Isaac Connor
0ac26277e3
debug, fix deprecations, fix audio
2017-06-02 16:52:52 -04:00
Isaac Connor
915450de13
spacing and comments
2017-06-01 17:48:52 -04:00
Isaac Connor
98b3621681
add Debug, and fix logic deleting frames before the appropriate keyframe
2017-05-31 20:44:43 -04:00
Isaac Connor
a6421a9126
handle deprecations
2017-05-31 20:44:23 -04:00
Isaac Connor
2eabf13eaf
handle deprecations, make some logic more clear
2017-05-31 20:44:13 -04:00
Isaac Connor
bc32837e3a
fix braces
2017-05-31 13:55:21 -04:00
Isaac Connor
772df5b41b
add a cast to quiet compiler warning
2017-05-30 10:31:02 -04:00
Isaac Connor
90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
Isaac Connor
54c9c37b21
Merge ../ZoneMinder.connortechnology
2017-05-20 09:55:06 -04:00
Isaac Connor
03495e8c23
fix
2017-05-20 09:54:03 -04:00
Isaac Connor
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
Isaac Connor
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
Isaac Connor
23633ce30b
braces
2017-05-20 09:06:12 -04:00
Isaac Connor
a5ee8307d0
Merge ../ZoneMinder.connortechnology
2017-05-20 09:03:57 -04:00