Isaac Connor
|
9153d2a986
|
when the audio stream is not aac, don't save it.
|
2016-08-31 15:59:05 -04:00 |
|
Isaac Connor
|
a1941c5a65
|
variable renaming to be more readable. Don't save anythign except AAC.
|
2016-08-31 15:46:19 -04:00 |
|
Isaac Connor
|
a51944b2c5
|
cleanup, remove separate audio and video queues
|
2016-08-31 15:38:44 -04:00 |
|
Isaac Connor
|
4dce24a276
|
write out queued packets when instantiating videostore
|
2016-08-31 15:38:24 -04:00 |
|
Isaac Connor
|
ddb7398017
|
fix scaling because the livestream has the monitorId appended to it now
|
2016-08-31 13:26:53 -04:00 |
|
Isaac Connor
|
f35fe185fb
|
the liveStream div now has the monitorId appended to it, so add that when we lookup the livestream and put a new rand on it to force a reload
|
2016-08-31 12:53:34 -04:00 |
|
Isaac Connor
|
824d7c5b43
|
Merge ../ZoneMinder.Steve into packetqueue
|
2016-08-31 11:58:22 -04:00 |
|
Isaac Connor
|
55c6e5a6db
|
cleanup putting packetqueue in the monitor. It should be in the camera
|
2016-08-31 11:47:42 -04:00 |
|
Isaac Connor
|
35d4650a1f
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-31 11:38:41 -04:00 |
Steve Gilvarry
|
e371d9ec7f
|
Merge pull request #7 from connortechnology/feature-h264-videostorage
Feature h264 videostorage
|
2016-09-01 01:07:33 +10:00 |
|
Isaac Connor
|
e74bf3fedf
|
pull in the new byte range code for viewing videos
|
2016-08-31 10:58:50 -04:00 |
|
Isaac Connor
|
fb35f5c48a
|
Merge ../ZoneMinder.master into feature-h264-videostorage
|
2016-08-31 10:58:19 -04:00 |
|
Isaac Connor
|
5f07911a63
|
fix spacing
|
2016-08-31 10:09:42 -04:00 |
|
Isaac Connor
|
ed1b6ccd58
|
Implement range support
|
2016-08-31 10:09:01 -04:00 |
|
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10:00 |
|
Isaac Connor
|
ffaf046485
|
fix missing /
|
2016-08-30 14:51:56 -04:00 |
|
Isaac Connor
|
27c1f95607
|
handle when ZM_BASE_PATH == '/'
|
2016-08-30 14:36:14 -04:00 |
|
Isaac Connor
|
a28e7d8df8
|
fix typo
|
2016-08-30 14:24:51 -04:00 |
|
Isaac Connor
|
7411b47834
|
fix typo
|
2016-08-30 14:23:20 -04:00 |
|
Isaac Connor
|
6ce18c3628
|
ZM_BASE_URL is deprecated. Use ZM_BASE_PATH instead
|
2016-08-30 14:08:52 -04:00 |
|
Isaac Connor
|
237a4494b2
|
correct incorrect use of isset instead of array_key_exists
|
2016-08-30 13:44:57 -04:00 |
|
Isaac Connor
|
6204ed8dd4
|
correct incorrect use of isset instead of array_key_exists
|
2016-08-30 13:43:49 -04:00 |
|
Isaac Connor
|
6994a76488
|
cleanup, update version #'s on db update scripts that need to move because we released 1.30
|
2016-08-30 12:27:45 -04:00 |
|
Isaac Connor
|
81dd65352d
|
better debugging and testing for different aspect ratios
|
2016-08-29 21:54:32 -04:00 |
|
Isaac Connor
|
747382f214
|
change double quotes to single quotes. When can't connect, print out the path to the sock file
|
2016-08-22 13:34:02 -04:00 |
|
Isaac Connor
|
d618b612fe
|
google code style & whitespace
|
2016-08-22 12:08:49 -04:00 |
|
Isaac Connor
|
944a131142
|
Merge ../ZoneMinder.master into storageareas
|
2016-08-22 11:49:50 -04:00 |
|
Isaac Connor
|
be7683299e
|
use single quotes instead of double quotes
|
2016-08-22 11:49:45 -04:00 |
|
Isaac Connor
|
09ebcfb7f8
|
only put in the development h3 tag if the value has been set
|
2016-08-22 11:42:44 -04:00 |
|
Isaac Connor
|
707694d4ea
|
google code style
|
2016-08-22 11:41:26 -04:00 |
|
Isaac Connor
|
d6b126fe8c
|
Add caller and line when an unknown function is called on the Monitor object
|
2016-08-22 11:28:53 -04:00 |
|
Isaac Connor
|
eafe3d7748
|
Merge branch 'master' into storageareas
|
2016-08-17 10:31:55 -04:00 |
|
Isaac Connor
|
c82c872665
|
add a default NULL value to __construct
|
2016-08-17 10:31:16 -04:00 |
Isaac Connor
|
69461a7c1b
|
Merge pull request #1579 from peruchi/master
Update file sock for multiserver
|
2016-08-17 10:23:01 -04:00 |
|
Isaac Connor
|
714c551359
|
Add some more fields relating to ptz controls that should be able to be NULL
|
2016-08-17 09:39:55 -04:00 |
Andrew Bauer
|
7d48b2c6c5
|
Merge pull request #1577 from ZoneMinder/fix_zmaControl
fix error in calling zmaControl
|
2016-08-17 08:36:51 -05:00 |
peruchi
|
50f55af68f
|
Update zmdc.pl.in
|
2016-08-17 10:36:00 -03:00 |
|
peruchi
|
7b389a79a6
|
Update zmdc.pl.in
|
2016-08-17 09:45:30 -03:00 |
|
Isaac Connor
|
cc696cbbc6
|
Merge pull request #1594 from vikaskedia/patch-2
Update README.md
|
2016-08-16 11:42:26 -04:00 |
|
Andy Bauer
|
4895942308
|
update fedora rpm readme
|
2016-08-16 09:49:45 -05:00 |
|
Andrew Bauer
|
ea34f3d69a
|
Merge pull request #1576 from ZoneMinder/show_other_zones
include polygons for the other zones.
|
2016-08-15 20:36:16 -05:00 |
|
Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
872adc1c62
|
Merge pull request #1578 from erelson/patch-2
Minor API doc error fixes
|
2016-08-15 10:02:57 -04:00 |
Vikas Kedia
|
31ca095445
|
Update README.md
|
2016-08-15 04:39:04 -07:00 |
|
Andrew Bauer
|
cd55c8b2fb
|
Merge pull request #1585 from ZoneMinder/copy_av_dict_parse_string_from_ffmpeg
Fixes #1584. I've just copied the relevant functions from ffmpeg sour…
|
2016-08-14 11:02:48 -05:00 |
|
Andrew Bauer
|
31cb86046c
|
Merge pull request #1592 from connortechnology/fix_analysis_frame
Fix analysis frame
|
2016-08-14 10:54:46 -05:00 |
|
Isaac Connor
|
a0bc30d3fe
|
fix the order of analyse/capture being passed
|
2016-08-12 15:40:47 -04:00 |
|
Isaac Connor
|
240336e3ec
|
silence error when Event has no StorageId set
|
2016-08-12 15:20:21 -04:00 |
|
Isaac Connor
|
9106675842
|
pass capture or analyse to getImageSrc
|
2016-08-12 15:17:13 -04:00 |
|
Isaac Connor
|
bcb7dd1ba4
|
take optional show= to specify the analyse image or the capture image
|
2016-08-12 15:16:05 -04:00 |