mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-21 23:32:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,083 Commits 80 Branches 104 Tags
45feac3d3602a2334bfebdb3cb049283efc3f5d8
Commit Graph

978 Commits

Author SHA1 Message Date
Andrew Bauer
62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
Isaac Connor
48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Andrew Bauer
97ee989a94 Parse multiple streams in RTP-Info 2014-12-02 19:33:05 -06:00
Andrew Bauer
a6a779978a move seq and rtpTime declarations outside conditional 2014-12-01 17:21:49 -06:00
Andrew Bauer
0099b54248 Make lack of RTP-Info non-fatal 2014-12-01 17:15:08 -06:00
Andrew Bauer
4a248cc3aa add rtsp mediatype of application 2014-12-01 17:05:10 -06:00
Andrew Bauer
32e818e860 Check for RTSP timeout in PLAY command response 2014-12-01 16:58:42 -06:00
Isaac Connor
02cdc37e3c Merge pull request #607 from manupap1/memory_fix_leaks 
Fix some memory leaks in zma
 2014-11-29 10:18:17 -05:00
Isaac Connor
51aa4e67ea Merge pull request #608 from knnniggett/RTSP_mUrl 
echo the URL to the RTSP device during the OPTIONS directive
 2014-11-29 10:14:26 -05:00
Andrew Bauer
e4fa475d87 Merge pull request #588 from ZoneMinder/digest_auth 
Digest auth
 2014-11-29 08:32:08 -06:00
Andrew Bauer
1cff253dde echo the URL to the RTSP device during the OPTIONS directive 2014-11-29 08:13:06 -06:00
Emmanuel Papin
346015f472 Fix some indentations in zm_monitor.h 2014-11-29 14:39:57 +01:00
Emmanuel Papin
c313e2e389 Fix a memory leak in Monitor::Analyse() 2014-11-29 06:06:10 +01:00
Emmanuel Papin
73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
Emmanuel Papin
41edb4d958 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks 2014-11-29 03:38:45 +01:00
Isaac Connor
e6d47781d3 add Digest Authentication handling for simple http method. 2014-11-28 15:56:58 -05:00
Isaac Connor
87c741b165 Merge pull request #574 from manupap1/rtsp_fix 
Fix memory leaks with rtsp and a bug
 2014-11-26 15:13:39 -05:00
Isaac Connor
51703f5c37 Merge pull request #575 from manupap1/memory_fix 
Close logger and database on exit
 2014-11-26 15:08:21 -05:00
Isaac Connor
00287ab5dd more debug output when buffer is undersized. 2014-11-25 14:51:20 -05:00
Isaac Connor
9eda71570a merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
Isaac Connor
0b5a0df7dc implement http_Digest Auth, and improve it for rtsp 
Conflicts:
	src/zm_remote_camera_http.cpp
	src/zm_rtsp.cpp
 2014-11-20 10:33:58 -05:00
Emmanuel Papin
81f4c2aa10 Revert memory leak patch in Monitor class (break analysis) 2014-11-20 00:33:22 +01:00
Isaac Connor
790005c155 Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms. 2014-11-19 12:42:05 -05:00
Emmanuel Papin
3d9a0f4729 Fix memory leaks in zmLoadConfig 2014-11-15 13:32:43 +01:00
manupap1
b2d3daaa65 Fix a mismatch free in zmc binary 2014-11-15 13:10:19 +01:00
manupap1
9eee62c6d2 Fix memory leaks in Image class 2014-11-15 12:58:08 +01:00
manupap1
658b9abea9 Fix memory leaks in Monitor class 2014-11-15 12:57:10 +01:00
manupap1
d2e849104c Fix memory leaks with rtsp and a bug 2014-11-14 22:31:03 +01:00
manupap1
a1aaeb7905 Merge branch 'master' into memory_fix 2014-11-14 22:24:33 +01:00
manupap1
b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00
manupap1
f05699a005 Fix a bug when closing RTSP session over TCP 2014-11-14 11:17:27 +01:00
Andrew Bauer
3a9f814303 Merge pull request #572 from ZoneMinder/buffer_cleanup 
remove the case for level >= 2.  Since level is a bool, this code can ne...
 2014-11-13 15:47:37 -06:00
Andrew Bauer
a00f719f12 Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes 
351-Rebase Attempt for ffmpeg stability fixes
 2014-11-13 15:18:13 -06:00
Isaac Connor
9016e30f92 BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports. 2014-11-13 14:47:07 -05:00
Isaac Connor
72f34203a0 remove the case for level >= 2. Since level is a bool, this code can never execute. Also, there are no calls to tidy in the current code with values other than 0 or 1, so it's safe to do. Also it removes an error message when using clang++ 2014-11-13 14:41:49 -05:00
Isaac Connor
1d6dffde47 Merge pull request #560 from manupap1/rtsp_fix 
Send keepalive messages if the rtsp server supports this feature
 2014-11-08 14:53:45 -05:00
Isaac Connor
b4a8ba8e8e Merge pull request #561 from manupap1/rtsp_fix2 
Use our own SSRC when sending packets on the RTP control stream
 2014-11-08 14:52:36 -05:00
Isaac Connor
3e8d49d88d add comment to improve understanding 2014-11-08 14:50:44 -05:00
manupap1
336c69e3c0 Use our own SSRC when sending packets on the control stream 2014-11-07 19:38:11 +01:00
manupap1
ea8b93be84 Use our own SSRC when sending packets on the control stream 2014-11-07 19:15:42 +01:00
manupap1
ee7d6a6254 Send keepalive messages if the rtsp server supports this feature 2014-11-07 17:39:50 +01:00
Andrew Bauer
23ee96c966 Merge pull request #556 from ZoneMinder/add_join 
Add a stringVector join function for future use
 2014-11-06 08:33:28 -06:00
manupap1
e764938a0d Fixed bug in rtsp streaming caused by a bad string concatenation 2014-11-06 10:16:28 +01:00
Isaac Connor
a88ce80716 Add a stringVector join function for future use 2014-11-05 14:01:48 -05:00
manupap1
fefc17b0fc Fixed bug in rtsp streaming caused by a signed - unsigned conversion. 2014-11-05 19:08:57 +01:00
Isaac Connor
57e5b4fee8 Fix segfault on zmu -l due to not connectig to the shared mem 2014-10-23 09:00:53 -04:00
Isaac Connor
8a33f78243 bugfix; coredump if no codec name was specified in url. 2014-10-15 14:35:01 -04:00
Isaac Connor
2a71973307 make zm compile using libav on ubunut 14.04 2014-10-15 13:23:29 -04:00
SteveGilvarry
6cb96f1316 Put opts back in 2014-10-12 16:47:27 +11:00
Sune1337
7534557533 - join reconnect thread when finished to clean up thread resources. 
- don't spawn a new thread for every attempt to open a stream while reconnecting.
 2014-10-12 16:31:27 +11:00