1667 Commits

Author	SHA1	Message	Date
Isaac Connor	dbd7d7d095	fix crash when not compiled with sws_resample	2016-11-03 16:43:48 -04:00
Isaac Connor	6a16db0361	get rid of extra line feed	2016-10-26 14:45:13 -04:00
Isaac Connor	420d141bc7	split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable	2016-10-18 09:50:01 -04:00
Isaac Connor	5b8b9c5345	merge update	2016-10-12 09:24:10 -04:00
Isaac Connor	9656a7c3e8	Store Oriention on event creation	2016-10-12 09:12:09 -04:00
Isaac Connor	2b37999cd5	Merge branch 'fix_zm_image_memleak' into storageareas	2016-10-07 11:39:03 -04:00
Isaac Connor	006fcad10a	move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging	2016-10-07 11:35:14 -04:00
Isaac Connor	37a4c67ae6	move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging	2016-10-07 11:33:25 -04:00
Isaac Connor	056e560b70	Merge ../ZoneMinder.master into storageareas	2016-10-02 12:25:51 -04:00
Isaac Connor	0df70a7e0f	if out the new code that frees structure on Image destroy. It creates a memleak	2016-10-02 12:24:33 -04:00
Isaac Connor	4fc64e4874	fix crash when not compiled with libswresample	2016-10-02 12:24:19 -04:00
Isaac Connor	f5914939df	Revert "if out the new code that frees structure on Image destroy. It creates a memleak" ... This reverts commit bb174ba49d.	2016-10-02 12:21:56 -04:00
Isaac Connor	bb174ba49d	if out the new code that frees structure on Image destroy. It creates a memleak	2016-10-02 12:20:39 -04:00
Isaac Connor	fb4a2babc7	better debug message	2016-09-30 09:37:41 -04:00
Isaac Connor	cf9fa78ca3	work on fixing event view	2016-09-29 09:28:48 -04:00
Isaac Connor	48d9f31fa9	add more debug	2016-09-28 09:08:00 -04:00
Isaac Connor	00ef0f4d78	alter code to use libv4l2	2016-09-28 08:43:41 -04:00
Isaac Connor	187e952ffc	append PATH_WEB for relative dir_events when instsantiating default Storage Object	2016-09-28 07:10:20 -04:00
Isaac Connor	89d4b9fec5	ifdef the libswresample lib stuff	2016-09-27 13:34:10 -04:00
Isaac Connor	13e8979a98	refactor some redundant code	2016-09-27 09:47:19 -04:00
Isaac Connor	f00b5d26b1	only start videostore on keyframe so as not to record non-keyframes	2016-09-26 20:43:08 -04:00
Isaac Connor	079aa827c5	whitespace	2016-09-26 20:08:45 -04:00
Isaac Connor	30acfcc2fd	do the videostore test in the constructor	2016-09-26 20:08:20 -04:00
Isaac Connor	85dd5ea00c	do the videostore test in the constructor	2016-09-26 20:08:09 -04:00
Isaac Connor	1bd652ce4b	just more messing around trying to get audio transcoding to work	2016-09-26 17:04:04 -04:00
Isaac Connor	06da04c5d7	Merge ../ZoneMinder.master into storageareas	2016-09-26 11:01:52 -04:00
Isaac Connor	bd22d72e18	cleanups, code style, free resample_context	2016-09-26 11:01:47 -04:00
Steve Gilvarry	c81f48716a	Was audio stream calls in middle of video packet write correct, was seg faulting	2016-09-27 00:42:40 +10:00
Steve Gilvarry	ab5dff1650	Match spacing, nope cannot be perfect	2016-09-26 21:43:08 +10:00
Steve Gilvarry	664bfded6f	Match spacing	2016-09-26 21:38:39 +10:00
Steve Gilvarry	2eba0b4c45	Swap event and web path around the right way	2016-09-26 21:22:58 +10:00
Isaac Connor	8f6007bb49	fixes	2016-09-25 11:26:48 -04:00
Isaac Connor	aaab089b72	make storagea->Path absolute by appending PATH_WEB	2016-09-25 09:31:20 -04:00
Isaac Connor	8e6136c821	reset start pts and dts when values are out of sync	2016-09-23 18:06:40 -04:00
Isaac Connor	0d418882e7	sorta works	2016-09-23 15:39:52 -04:00
Isaac Connor	b8c7b6ae77	Merge branch 'storageareas' into record_audio	2016-09-23 11:34:15 -04:00
Isaac Connor	782f9395ae	turn down the debugging	2016-09-23 09:51:03 -04:00
Isaac Connor	a5b7b6e74f	move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video	2016-09-22 10:43:20 -04:00
Isaac Connor	95bbaf42b6	change the version test to include ffmpeg 56.60.100 for av_packet_unref	2016-09-21 16:03:24 -04:00
Isaac Connor	984394f920	packet needs to be both unref'd and freed when we use av_malloc to allocate a packet	2016-09-21 16:02:51 -04:00
Isaac Connor	32d145cf2e	free writejpg_ccinfo structs as well	2016-09-21 16:02:14 -04:00
Isaac Connor	4b5af390fd	merge	2016-09-21 12:44:27 -04:00
Isaac Connor	249d3cadc5	fix for video on stream 1	2016-09-21 12:17:09 -04:00
Isaac Connor	1310aee1cc	handle video stream at index 1 without audio	2016-09-21 12:12:40 -04:00
Isaac Connor	6292ce3748	undo stupid thing	2016-09-21 12:07:58 -04:00
Isaac Connor	2f248cd4b1	log time bases on videostore instantiation instead of every packet	2016-09-21 11:58:59 -04:00
Isaac Connor	f5405a4131	clearer debug output	2016-09-21 11:57:42 -04:00
Isaac Connor	ae63861cd1	better codec_tag setting	2016-09-21 11:57:30 -04:00
Isaac Connor	8b13401250	more debugging	2016-09-21 11:37:59 -04:00
Isaac Connor	a8c4fdd616	more debug	2016-09-21 10:58:02 -04:00