1468 Commits

Author	SHA1	Message	Date
Isaac Connor	b309837f02	put back zmDbRow use	2016-05-25 10:21:44 -04:00
Isaac Connor	7a08d4620f	Merge branch 'master' into storageareas	2016-05-25 10:17:46 -04:00
Isaac Connor	8fabeb78d3	Merge branch 'fix_zone_edit' into storageareas	2016-05-24 15:55:49 -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
Isaac Connor	710ecd5b19	Put rotation metadata in the video stream metadata where it belongs	2016-05-16 14:36:09 -04:00
Isaac Connor	c11a92efdd	implement 180,270 rorations and cleanup	2016-05-13 15:11:17 -04:00
Isaac Connor	943a4cef73	Merge branch 'storageareas' into rotate_video	2016-05-13 15:00:50 -04:00
Isaac Connor	71e9553648	add rotation to video	2016-05-13 14:51:26 -04:00
Isaac Connor	4843cb094e	more debug	2016-05-11 11:59:41 -04:00
Isaac Connor	958cf6f3c7	fix merge problem causing duplicated lock	2016-05-11 11:35:38 -04:00
Isaac Connor	add4992dea	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-05-09 21:08:13 -04:00
Isaac Connor	a8de0bff71	Merge branch 'master' into storageareas	2016-05-09 19:30:02 -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	654d4d2bee	Merge branch 'api_fixes' into storageareas	2016-05-07 10:56:47 -04:00
Isaac Connor	18461b0c64	Add some debugging	2016-05-06 12:39:10 -04: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	49dc917b2e	Merge isaac:ZoneMinder.p1 into storageareas	2016-05-05 15:24:14 -04:00
Isaac Connor	e64376ed02	increase debug level for Zone motion detection	2016-05-05 14:51:41 -04:00
Isaac Connor	88a0bdc026	Add some code comments. Make mocord always honour section_length	2016-05-05 14:51:26 -04:00
Isaac Connor	e8cbb90125	increase log debug level for blend routing reporting	2016-05-05 14:50:50 -04:00
Isaac Connor	c3628a8dfd	Merge branch 'updated-console' into storageareas	2016-05-03 14:34:58 -04:00
Isaac Connor	341ebc7b45	Merge branch 'master' into bind_fixes	2016-05-02 12:39:55 -04:00
Isaac Connor	819dad455e	whitespace/tabs	2016-04-29 09:11:14 -04:00
Isaac Connor	b41a3b1b25	fix tabs/shiftwidth	2016-04-29 09:01:28 -04:00
Isaac Connor	5eebc50bfb	tabs to spaces	2016-04-29 08:57:31 -04:00
Isaac Connor	728bffa6a0	Check and set audio to mono	2016-04-29 08:52:25 -04:00
Isaac Connor	af66105c37	Merge branch 'master' into storageareas	2016-04-29 08:28:53 -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	097e7f3906	Merge branch 'master' into storageareas	2016-04-28 16:40:44 -04: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	30b3fa8a8b	add a cast to help the compile figure out which function to use	2016-04-28 12:57:38 -04:00
Isaac Connor	1096461793	Need a cast to handle old avformat	2016-04-28 12:57:14 -04:00
Isaac Connor	1282e36bb2	av_get_media_type_string is not available in trusty	2016-04-28 12:56:40 -04:00
Isaac Connor	337d8a748c	simplify the separator stuff	2016-04-28 12:56:19 -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	59406fd03a	Merge branch 'master' into storageareas	2016-04-28 09:24:36 -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