Isaac Connor
|
8efeb41f7d
|
use new clear_unwanted_packets and a clearQueue version that keeps the approprate # of frames
|
2017-04-12 13:38:12 -04:00 |
|
Isaac Connor
|
954c863ad8
|
add a non-const version of StartTime() which we need in order to assign to video_data->recording
|
2017-04-12 13:36:49 -04:00 |
|
Isaac Connor
|
7e920eb5d3
|
add a non-const version of StartTime() which we need in order to assign to video_data->recording
|
2017-04-12 13:36:39 -04:00 |
|
Isaac Connor
|
669a23c408
|
change type of width and height to unsigned int and recording from bool to timeval
|
2017-04-12 13:35:07 -04:00 |
|
Isaac Connor
|
bdb6dd63a3
|
change type of width and height to unsigned int and recording from bool to timeval
|
2017-04-12 13:32:22 -04:00 |
|
Isaac Connor
|
eb390c323e
|
Merge branch 'storageareas' into ffmpeg_321
|
2017-04-11 11:14:23 -04:00 |
|
Isaac Connor
|
161aaac3f2
|
cleanup swsresample stuff. resampling now works
|
2017-04-11 10:39:43 -04:00 |
|
Isaac Connor
|
a2a823e3ec
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-11 08:54:54 -04:00 |
Isaac Connor
|
916cdbfcd2
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-10 21:58:16 -04:00 |
|
Isaac Connor
|
9291c154a1
|
Merge branch 'split_monitor_stream' into storageareas
|
2017-04-10 21:58:01 -04:00 |
|
Isaac Connor
|
42e94d1a7c
|
contains the MonitorStream class
|
2017-04-10 21:57:31 -04:00 |
|
Isaac Connor
|
a58259c60e
|
include other libjpeg alternatives. Include a libpcre dependency
|
2017-04-10 21:55:52 -04:00 |
|
Isaac Connor
|
e4a20caf24
|
put quotes around
|
2017-04-10 21:55:11 -04:00 |
|
Isaac Connor
|
620797ac18
|
replace swresample with libavresample
|
2017-04-10 21:54:23 -04:00 |
|
Isaac Connor
|
2220b04203
|
need to include zm_monitorstream.h now
|
2017-04-10 21:52:29 -04:00 |
|
Isaac Connor
|
766925d9a7
|
Split MonitorStream into it's own files.
|
2017-04-10 21:51:18 -04:00 |
|
Isaac Connor
|
57bf1bb4e0
|
add needed quotes
|
2017-04-10 16:56:59 -04:00 |
|
Isaac Connor
|
48d658790a
|
Merge branch 'storageareas' into optimisations
|
2017-04-09 17:36:24 -04:00 |
|
Isaac Connor
|
58a0c82015
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-09 15:41:40 -04:00 |
|
Isaac Connor
|
4215f227da
|
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
|
2017-04-07 13:43:09 -04:00 |
|
Isaac Connor
|
6ec340d525
|
Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements
|
2017-04-07 13:38:50 -04:00 |
|
Isaac Connor
|
7f4fb64495
|
blah
|
2017-04-07 13:38:41 -04:00 |
|
Isaac Connor
|
ed04c44ad0
|
comment out delete_empty_directories. It is too intensive
|
2017-04-07 13:21:33 -04:00 |
|
Isaac Connor
|
d462dfdb77
|
fix error message when fid not specified
|
2017-04-07 13:20:54 -04:00 |
|
Isaac Connor
|
92a2d6f4f2
|
hide the video, let's stick with jpeg's, which will be auto-generated
|
2017-04-07 13:20:28 -04:00 |
|
Isaac Connor
|
8f51331472
|
fix timeline view by using view=image instead of direct path
|
2017-04-07 13:20:04 -04:00 |
|
Isaac Connor
|
94ddfc4053
|
Fix
|
2017-04-07 11:58:27 -04:00 |
|
Isaac Connor
|
5c3a582252
|
The signal we should be blocking is SIGCHLD not SIGINT
|
2017-04-06 21:21:28 -04:00 |
|
Isaac Connor
|
6a9819e16b
|
whitespace, comments
|
2017-04-05 16:10:21 -04:00 |
|
Isaac Connor
|
2b9a0f96d3
|
remove and break over multiple lines
|
2017-04-05 16:10:06 -04:00 |
|
Isaac Connor
|
d611840750
|
whitespace, handle NaN in limitArea
|
2017-04-05 16:09:40 -04:00 |
|
Isaac Connor
|
c5ff45922f
|
fix zone edit height
|
2017-04-05 16:09:06 -04:00 |
|
Isaac Connor
|
a689fcff88
|
Fix use Time::HiRes
|
2017-04-05 16:08:47 -04:00 |
|
Isaac Connor
|
452e9571ee
|
add a different size warning
|
2017-04-05 16:08:29 -04:00 |
|
Isaac Connor
|
15e69fc817
|
fix . to ->
|
2017-04-05 10:39:38 -04:00 |
|
Isaac Connor
|
1dbf599f10
|
add a cast to get rid of build warning
|
2017-04-05 10:36:44 -04:00 |
|
Isaac Connor
|
7815f1c539
|
introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups
|
2017-04-05 10:05:21 -04:00 |
|
Isaac Connor
|
372fde7a8a
|
fix typos in LIBSWRESAMPLE_H
|
2017-04-04 15:28:48 -04:00 |
|
Isaac Connor
|
1f3eecbd6c
|
change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping.
|
2017-04-04 15:15:37 -04:00 |
|
Isaac Connor
|
e70c7fa1ef
|
whitespace and comments
|
2017-03-31 23:34:58 -04:00 |
|
Isaac Connor
|
08766b7546
|
decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file
|
2017-03-31 14:33:00 -04:00 |
|
Isaac Connor
|
c944870526
|
sleep 100usec
|
2017-03-31 13:49:44 -04:00 |
|
Isaac Connor
|
58d119d9ed
|
Merge branch 'fix_1762' into storageareas
|
2017-03-31 13:38:59 -04:00 |
|
Isaac Connor
|
d3b6792a6a
|
block signals around checking for a process to die
|
2017-03-31 12:25:48 -04:00 |
|
Isaac Connor
|
514c83d3e9
|
whitespace and add a test for ->Triggers being an array
|
2017-03-31 12:01:37 -04:00 |
|
Isaac Connor
|
d1a60dedc8
|
Fix the overzealous use of escapeshellcmd that breaks restarting monitors
|
2017-03-31 11:59:55 -04:00 |
|
Isaac Connor
|
30455feef7
|
code style
|
2017-03-31 11:12:52 -04:00 |
|
Isaac Connor
|
9c495b07dd
|
code style, whitespace, comments
|
2017-03-31 11:12:42 -04:00 |
|
Isaac Connor
|
26dfe45ec6
|
delete the videostore on camera delete so that the .mp4 gets written to disk
|
2017-03-31 11:06:15 -04:00 |
Andrew Bauer
|
7068efd581
|
rpmspecfile - modify tarball handling
|
2017-03-30 18:31:58 -05:00 |