Isaac Connor
|
fece06c9e3
|
google code style
|
2017-10-19 17:12:36 -04:00 |
|
Isaac Connor
|
666233af54
|
fix mving capture_file_format to staticCOnfig
|
2017-10-18 20:46:26 -04:00 |
Isaac Connor
|
10accc4226
|
google code style
|
2017-10-18 10:23:40 -07:00 |
|
Isaac Connor
|
965e1e8bc1
|
improve readability of debug statement
|
2017-10-18 10:22:53 -07:00 |
|
Isaac Connor
|
f81471da09
|
google code style
|
2017-10-18 10:22:37 -07:00 |
|
Isaac Connor
|
3436c65aab
|
minor logic improvement
|
2017-10-18 10:22:15 -07:00 |
|
Isaac Connor
|
4b30dd540c
|
tabs to spaces
|
2017-10-18 10:21:54 -07:00 |
|
Isaac Connor
|
ad97023732
|
spacing
|
2017-10-12 08:54:43 -07:00 |
|
Isaac Connor
|
8ea335d45e
|
whitespace
|
2017-10-10 15:08:24 -04:00 |
|
Isaac Connor
|
7b2163f824
|
add debug
|
2017-10-10 12:58:06 -04:00 |
|
Isaac Connor
|
c654d008f0
|
add monitor selector to montagereview and montage.
|
2017-10-10 09:36:56 -04:00 |
|
Isaac Connor
|
b6974ea373
|
Add monitor drorpdown to montagereview
|
2017-10-09 15:32:09 -04:00 |
|
Isaac Connor
|
219b7e0f36
|
output failing sql
|
2017-10-08 09:13:56 -04:00 |
|
Isaac Connor
|
7b7d477ab2
|
spacing, increase debug level of discovered formats. Don't crash if device returns more than 64 formats
|
2017-10-08 09:13:37 -04:00 |
|
Isaac Connor
|
df1fa97e0c
|
handle nulls in StorageId and device
|
2017-10-06 16:17:37 -04:00 |
APHW2 MFGENG
|
c11f310f54
|
fix
|
2017-10-03 14:51:57 -07:00 |
|
APHW2 MFGENG
|
354262c557
|
wip nvsocket
|
2017-10-03 13:28:56 -07:00 |
|
Isaac Connor
|
a1847aff75
|
add in new experimental nvsocket camera
|
2017-10-02 12:57:40 -04:00 |
|
Isaac Connor
|
ddb7305aab
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-02 09:11:55 -04:00 |
Isaac Connor
|
8c1cfb28a5
|
use c-style casts because they work
|
2017-09-26 16:13:26 -04:00 |
|
Isaac Connor
|
94fd113b63
|
use c-style casts because they work
|
2017-09-26 16:12:20 -04:00 |
|
Isaac Connor
|
1ba0a52769
|
remove const... which is preventing us from building on trusty
|
2017-09-26 12:53:54 -04:00 |
|
Isaac Connor
|
38a4ca1a6f
|
use storageareas when outputting zone diag images
|
2017-09-26 09:33:33 -04:00 |
|
Isaac Connor
|
e277456682
|
put parenthesis back in
|
2017-09-26 09:15:54 -04:00 |
|
Isaac Connor
|
9f93bfc23b
|
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
|
2017-09-25 18:45:58 -04:00 |
|
Isaac Connor
|
1791d3d5b7
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-09-25 16:23:33 -04:00 |
|
Isaac Connor
|
84be41998a
|
make debug lines more informative
|
2017-09-25 16:23:27 -04:00 |
|
Isaac Connor
|
74bb2da668
|
remove extra parenthesis
|
2017-09-25 16:23:15 -04:00 |
|
Isaac Connor
|
3227599e01
|
google code style
|
2017-09-25 16:22:52 -04:00 |
|
Isaac Connor
|
869d2b4f16
|
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
|
2017-09-25 16:22:41 -04:00 |
|
Isaac Connor
|
8941bc80b8
|
reduce log level for success debug message
|
2017-09-25 16:21:46 -04:00 |
|
Isaac Connor
|
2a39cf2bcd
|
split videostore opening out of the constructor so that we can test for failure
|
2017-09-25 15:28:14 -04:00 |
|
Isaac Connor
|
fef503f90c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-09-23 13:42:44 -04:00 |
|
Isaac Connor
|
fa37a55226
|
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
|
2017-09-23 13:41:20 -04:00 |
|
Isaac Connor
|
7d2453e7ac
|
fix google code style
|
2017-09-04 15:28:23 -04:00 |
|
Isaac Connor
|
08bdf5a729
|
fix build on trusty
|
2017-08-24 12:19:57 -04:00 |
|
Isaac Connor
|
2a4f751a4f
|
ffmpeg versionc heck
|
2017-08-24 12:00:48 -04:00 |
|
Isaac Connor
|
2daae43760
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-08-24 10:14:00 -04:00 |
|
Isaac Connor
|
48e9e12063
|
assume source=monitor when a monitor_id is specified
|
2017-08-24 10:13:46 -04:00 |
Isaac Connor
|
789de37d33
|
fix builds on older ffmpeg
|
2017-08-24 09:53:40 -04:00 |
|
Isaac Connor
|
a4cf47b5c3
|
move swscale into it's own files
|
2017-08-23 15:06:12 -04:00 |
|
Isaac Connor
|
a81ff85fbb
|
add ffmpeg decoding of a .mp4 to get the frames
|
2017-08-23 15:05:44 -04:00 |
|
Isaac Connor
|
5c13ae26e3
|
Merge branch 'storageareas' into work_on_zms
|
2017-08-23 10:43:19 -04:00 |
|
Isaac Connor
|
732ebf6df4
|
shorted some variable names and correct spacing
|
2017-08-23 10:37:32 -04:00 |
|
Isaac Connor
|
eb5cee7f3e
|
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
|
2017-08-23 10:14:06 -04:00 |
|
Isaac Connor
|
e98ea0b891
|
fix non hwaccel build
|
2017-08-22 10:47:37 -04:00 |
|
Isaac Connor
|
676c4b7ddc
|
Merge branch 'master' into storageareas
|
2017-08-22 09:52:14 -04:00 |
Andrew Bauer
|
ac5d1738ea
|
allow changing of the timestamp char code delimeter (#1972)
|
2017-08-21 11:27:11 -04:00 |
Isaac Connor
|
cf8560b648
|
fix duration if it's negative
|
2017-08-21 10:15:56 -04:00 |
|
Isaac Connor
|
a63d0878b6
|
remove more hwaccel code
|
2017-08-16 13:41:44 -04:00 |