Isaac Connor
|
5dd4359b80
|
Merge pull request #1852 from knnniggett/cakelog
move cake log to zoneminder log folder
|
2017-04-14 21:09:50 -04:00 |
Andrew Bauer
|
0b729cf295
|
modify cmakelists.txt
|
2017-04-14 15:15:29 -05:00 |
|
Andrew Bauer
|
d2490cf7e3
|
make cake tmp = zoneminder tmp
|
2017-04-14 15:11:41 -05:00 |
|
Andrew Bauer
|
48a73f7e78
|
change cache engine from File -> Apc
|
2017-04-14 14:31:42 -05:00 |
|
Andrew Bauer
|
3cbd32cd41
|
move cake log to zoneminder log folder
|
2017-04-14 14:24:29 -05:00 |
Andrew Bauer
|
48e2c5f6ec
|
Update redhat.rst
|
2017-04-14 12:40:32 -05:00 |
|
Isaac Connor
|
09d8d7e40f
|
Merge pull request #1851 from knnniggett/timestamponcapture
invert timestamp_on_capture condition
|
2017-04-14 11:05:04 -04:00 |
|
Andrew Bauer
|
a6799a8aaa
|
remove unneeded files
|
2017-04-14 06:40:09 -05:00 |
|
Andrew Bauer
|
6b0f587725
|
invert timestamp_on_capture condition
|
2017-04-13 15:51:50 -05:00 |
Isaac Connor
|
a5e7db0f7c
|
use faster ffmpeg method to generate frame image
|
2017-04-13 12:35:14 -04:00 |
|
Isaac Connor
|
0bbe5d19a6
|
add libavresample to build depends
|
2017-04-13 09:59:35 -04:00 |
|
Isaac Connor
|
d8e27fe01a
|
Merge ../release/zoneminder_0.30.13~20170412162034-trusty.orig into storageareas
|
2017-04-13 09:48:56 -04:00 |
|
Isaac Connor
|
f6067ab969
|
undo c++11 requirements
|
2017-04-13 09:47:47 -04:00 |
|
Isaac Connor
|
83219d3e34
|
define av_frame_free to av_freep on older ffmpeg. Undo c++11 requirements.
|
2017-04-13 09:47:19 -04:00 |
|
Isaac Connor
|
b03d0d09da
|
fix typo
|
2017-04-13 09:08:15 -04:00 |
|
Isaac Connor
|
9027c0ee06
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-12 16:20:09 -04:00 |
|
Isaac Connor
|
c9482d8ae8
|
add extra quotes where neccessary, fix the release case
|
2017-04-12 16:20:04 -04:00 |
|
Isaac Connor
|
7d6505f015
|
use Delta to grab frame from video, using -ss for speed
|
2017-04-12 16:17:19 -04:00 |
|
Isaac Connor
|
f97e074393
|
braces fixes
|
2017-04-12 16:16:56 -04:00 |
|
Isaac Connor
|
d1f04a60f9
|
fix errors calculating dts
|
2017-04-12 16:16:37 -04:00 |
|
Isaac Connor
|
d039227f79
|
Merge branch 'master' into storageareas
|
2017-04-12 13:51:10 -04:00 |
|
Isaac Connor
|
e28be26978
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-12 13:41:16 -04:00 |
|
Isaac Connor
|
6e7bd9311d
|
add the api tmp cache folders to the tmpfiles
|
2017-04-12 13:41:02 -04:00 |
|
Isaac Connor
|
51d5bfc8d5
|
introduce a helper function to print out a timeval
|
2017-04-12 13:40:38 -04:00 |
|
Isaac Connor
|
ecb57f8f04
|
change bool recording to a timeval.
|
2017-04-12 13:40:17 -04:00 |
|
Isaac Connor
|
575b3138de
|
change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames
|
2017-04-12 13:39:47 -04:00 |
|
Isaac Connor
|
a0b57cedeb
|
change bool recording to a timeval. and add GetPreEventCount
|
2017-04-12 13:39:12 -04:00 |
|
Isaac Connor
|
e3d3fc3411
|
change bool recording to a timeval.
|
2017-04-12 13:38:56 -04:00 |
|
Isaac Connor
|
59c85c1fbb
|
change bool recording to a timeval.
|
2017-04-12 13:38:39 -04:00 |
|
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 |