ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,499 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6499 Commits

Author SHA1 Message Date
Steve Gilvarry 44df4a830d Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 20:44:48 +10:00
Steve Gilvarry 7c5cc6f35e Merge branch 'feature-h264-videostorage' of https://github.com/SteveGilvarry/ZoneMinder into feature-h264-videostorage 2016-08-11 20:35:04 +10:00
Steve Gilvarry 158f8c802e Merge pull request #6 from connortechnology/Rotation 
Rotation
 2016-08-11 09:52:23 +10:00
Isaac Connor 1277f3c792 need arpa/inet for reverse lookups 2016-08-10 12:32:58 -04:00
Isaac Connor 6ac1a70b9c Merge my Rotation/Orientation work and fixes for bad h264 streams 2016-08-10 12:22:04 -04:00
Isaac Connor be057acfed Merge ../ZoneMinder.Steve into Steve 2016-08-10 11:04:43 -04:00
Isaac Connor 8ee86f5d00 Merge pull request #1589 from SteveGilvarry/feature-h264-videostorage 
Merging Master into Feature-h264-videostorage
 2016-08-10 11:02:03 -04:00
Steve Gilvarry 21c46bb519 Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 00:52:35 +10:00
Steve Gilvarry 5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Isaac Connor d6dfe3dc72 Merge pull request #3 from ZoneMinder/master 
updates from ZoneMinder/ZoneMinder
 2016-08-10 10:19:24 -04:00
Isaac Connor 6b70ff964b fix path in cake api cleanup rules 2016-08-10 09:06:15 -04:00
Isaac Connor fbc0086fcc get the other dbPass use and quote it. Slight visual code style cleanup. 2016-08-08 16:52:09 -04:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
Andrew Bauer 24d471f452 Merge pull request #1503 from ZoneMinder/id_on_console 
add option to show monitor ID on console
 2016-08-06 10:59:03 -05:00
Isaac Connor 9d65ef3bb2 Merge pull request #1556 from knnniggett/banner 
custom banner text on web console
 2016-08-06 10:59:53 -04:00
Andrew Bauer f67394ffb7 Merge pull request #1567 from SteveGilvarry/avdictparsestring 
Use av_dict_parse_string to create AVDictionary of options
 2016-08-06 09:50:49 -05:00
Andrew Bauer 528230c92d Merge pull request #1581 from ZoneMinder/fix_1571 
quote the password
 2016-08-06 09:37:11 -05:00
Andrew Bauer 382896dc0d Merge pull request #1498 from josh4trunks/mysql_port_socket 
Add support for MySQL Port / Unix Socket
 2016-08-06 09:32:32 -05:00
Andrew Bauer 6c8001f362 Merge pull request #1549 from SteveGilvarry/initd_sql_wait 
Implement suggested wait for MySQL start
 2016-08-06 09:14:58 -05:00
Andrew Bauer e6b1cf90df Merge pull request #1566 from gerdesj/Keekoon 
Control script for Keekoon cameras.
 2016-08-06 09:09:40 -05:00
Steve Gilvarry e0a34bce8a Merge pull request #1582 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-08-05 23:18:42 +10:00
Steve Gilvarry ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10:00
Steve Gilvarry cf84dde613 segfault cause I think I am missing the queue 2016-08-03 23:48:33 +10:00
Isaac Connor 25d58f5192 quote the password 2016-08-02 13:22:44 -04:00
Steve Gilvarry 0425c68d59 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue 2016-08-02 20:17:35 +10:00
Andrew Bauer 004b651d61 RPM specfile config change 
use make macros, rather than hard coded values
 2016-07-31 15:06:39 -05:00
Andrew Bauer 3c6692d0d5 RPM specfile config change 
fix logrotate script
 2016-07-31 07:29:37 -05:00
Steve Gilvarry acb2121618 Merge pull request #1570 from SteveGilvarry/feature-h264-videostorage 
Add libx264-dev and libmp4v2-dev to build requires to save hassle of
 2016-07-31 13:52:44 +10:00
Steve Gilvarry 3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of 
ensuring they are installed before build.
 2016-07-31 08:24:52 +10:00
Steve Gilvarry 97aa674274 Merge pull request #1559 from onlyjob/warn 
reduce noise on "zmupdate.pl" invocation
 2016-07-30 00:41:55 +10:00
Steve Gilvarry 24aeb91ef2 Merge pull request #1558 from onlyjob/spellcheck 
spellcheck/codespell
 2016-07-30 00:35:10 +10:00
Andrew Bauer 627b838fc4 Merge pull request #1565 from SteveGilvarry/avdict 
Enable local and travis ccache
 2016-07-29 09:34:11 -05:00
Steve Gilvarry e0e49a2734 Merge pull request #1511 from TJC/feature/improve_docker 
Improve Docker features
 2016-07-30 00:30:49 +10:00
Steve Gilvarry 1a684b7709 Remove whitespace 2016-07-28 23:22:34 +10:00
Steve Gilvarry 71e3789bd0 Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport 2016-07-28 23:15:01 +10:00
Steve Gilvarry e7aed10f77 Merge pull request #1564 from pliablepixels/api-config-edit-example 
Added example of configs API edit
 2016-07-28 11:45:26 +10:00
Jon Gerdes ee720c4561 Control script for Keekoon cameras. Tested with KK002. 2016-07-25 11:20:49 +01:00
Steve Gilvarry 0234e82396 Enable local and travis ccache 2016-07-24 09:26:10 +10:00
Pliable Pixels dc916bba2c case typo 2016-07-23 08:04:46 -04:00
Pliable Pixels 45a62dc8d8 Added example of configs API edit 2016-07-23 08:03:15 -04:00
Steve Gilvarry 14437189ca Merge pull request #5 from knnniggett/patch-1 
Update zoneminder.init
 2016-07-18 21:04:51 +10:00
Steve Gilvarry d9292319fd Merge pull request #1563 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-07-17 10:02:14 +10:00
Steve Gilvarry b9a48eb464 Pass swscale_ctx back in to getCachedContext or it will create new 
context every frame and leak memory like a mofo.
 2016-07-17 08:11:53 +10:00
Dmitry Smirnov aed3c3d29a reduce noise on "zmupdate.pl" invocation 2016-07-14 00:43:32 +10:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Steve Gilvarry b05eabfe1d Forgot that I was trying to solve case of stream is true and record_audio 
is false.
 2016-07-13 08:31:10 +10:00
Andrew Bauer 59cc952cef Merge pull request #1557 from ZoneMinder/fix_zmvideo 
restore the behaviour where the generated file names are printed to stdout
 2016-07-12 15:06:57 -05:00
Isaac Connor 85c0377280 When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it 2016-07-12 14:21:54 -04:00
Steve Gilvarry f1b9e1205a Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio 2016-07-12 23:13:02 +10:00
Isaac Connor 6129732e61 restore the behaviour where the generated file names are printed to stdout. 2016-07-11 08:01:43 -04:00