mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 14:27:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,950 Commits 80 Branches 104 Tags
b2d1d688ccd0c0e22de4c5d662467cfecf49ceeb
Commit Graph

1245 Commits

Author SHA1 Message Date
Andrew Bauer
97baf4ecd3 Merge pull request #1529 from ZoneMinder/fix_1526 
connect needs a +1
 2016-06-24 09:53:46 -05:00
Isaac Connor
472973e975 connect needs a +1 2016-06-12 15:45:24 -04:00
Andrew Bauer
f289b84901 move VIDEO_MAX_FRAME up 2016-06-06 19:04:02 -05:00
Andy Bauer
06923d44ba Set VIDEO_MAX_FRAME if it is not defined 2016-06-06 16:27:13 -05:00
Isaac Connor
2385575c56 fix +1 being outside bind() 2016-06-02 16:23:04 -04:00
Andy Bauer
d12b9dc16d fix typo. needs } 2016-05-24 09:24:18 -05:00
Andy Bauer
6e82f2c9a9 add messages back with debug 3 2016-05-24 08:50:09 -05:00
Andrew Bauer
bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
Isaac Connor
58d326681a quick fix for gcc6 2016-05-17 09:17:19 -04:00
Isaac Connor
435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Steve Gilvarry
413eced6df Merge pull request #1450 from ZoneMinder/bind_fixes 
add some error checking, but fix the call to bind
 2016-05-10 08:00:10 +10:00
Isaac Connor
fd896acd50 Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6 2016-05-06 08:32:21 -04:00
Isaac Connor
341ebc7b45 Merge branch 'master' into bind_fixes 2016-05-02 12:39:55 -04:00
Steve Gilvarry
e73935a15b Clean up extraneous avutil include 2016-04-29 21:29:07 +10:00
Steve Gilvarry
8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor
0dc2987b84 add some error checking, but fix the call to bind which really should have a +1 in it. 2016-04-28 16:32:50 -04:00
Isaac Connor
fac07cba6d Merge branch 'master' into tabs_to_spaces 2016-04-28 09:31:40 -04:00
Isaac Connor
629f141734 Merge pull request #1441 from SteveGilvarry/remove_commented_code 
Delete large commented out code segment
 2016-04-28 09:30:43 -04:00
Isaac Connor
24e3306955 master master 2016-04-28 09:20:56 -04:00
Steve Gilvarry
af361042ef Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string 
use std::string instead of C strings. Mostly this will quiet build wa…
 2016-04-28 22:13:44 +10:00
Steve Gilvarry
d9fd0faa32 Merge pull request #1447 from ZoneMinder/simplify_zm_signal 
Simplify zm signal
 2016-04-28 21:37:55 +10:00
Isaac Connor
69d5065ebf move ip down as well 2016-04-26 16:05:37 -04:00
Isaac Connor
5d88acb8a6 re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd 2016-04-26 16:03:26 -04:00
Isaac Connor
7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
abi
9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor
2d8c484792 rotate dimensions when instantiating the Monitor object 2016-04-25 16:48:26 -04:00
Isaac Connor
8c53925fdc redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions. 2016-04-25 16:00:34 -04:00
Isaac Connor
26a45d5fa9 Don't rotate dimensions when constructing the monitor because they are already rotated 2016-04-25 13:55:28 -04:00
Steve Gilvarry
4ca61b7bd8 Removed 180 lines of commented out code that has been hanging around 
in here for a long time.
 2016-04-25 22:12:49 +10:00
Andrew Bauer
28b30ecb47 Merge pull request #1377 from ZoneMinder/random_fixes 
Random fixes
 2016-04-11 12:04:05 -05:00
Andy Bauer
4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer
7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor
ecce87b779 mamke status a member so that we aren't return the address of a local variable 2016-03-31 14:43:22 -04:00
Isaac Connor
a16c1746e5 separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value 2016-03-24 10:00:02 -04:00
Isaac Connor
1e52a8ad2c remove unused class member 2016-03-24 09:44:34 -04:00
Isaac Connor
b6ee4e4228 move return up into #ifdef. 2016-03-24 09:43:15 -04:00
Isaac Connor
0c32ae61ef Merge branch 'master' into fix_coverity_issues 2016-03-24 09:42:01 -04:00
Jon Burgess
bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
SteveGilvarry
5f4441878e Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already. 2016-03-03 17:16:06 +11:00
SteveGilvarry
2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry
e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11:00
SteveGilvarry
0277a66700 Remove eyezm from distros and Cmake. 
Conflicts:
	distros/debian8/control
 2016-02-26 22:41:27 +11:00
SteveGilvarry
4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp. 
Conflicts:
	src/zmstreamer.cpp
 2016-02-26 22:37:23 +11:00
SteveGilvarry
5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
Kaarle Ritvanen
5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Isaac Connor
6f221ed269 Merge pull request #1278 from schrorg/bigfont-license 
Added script to generate src/zm_bigfont.h
 2016-02-16 09:17:54 -05:00
Kaarle Ritvanen
6332f28c53 zm_monitor: fix overlap in memcpy buffers 
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
 2016-02-16 11:47:49 +02:00
arjunrc
e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05:00
Robin Daermann
f5ef721ebd Add IP6 address type to valid types for ConnInfo 2016-02-10 17:53:00 +01:00