4092 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	83c251fc1c	fix bug	2016-12-08 17:29:13 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	b06203e777	dispose kafka	2016-12-08 11:48:50 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	5a76f15e4e	fix typo and refine grammar. 3.0.7	2016-12-07 14:43:14 +08:00
winlin	cda9beeba7	refine comments	2016-12-07 14:40:25 +08:00
winlin	d194691c09	refine comments	2016-12-07 14:37:28 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	f6c8e02cca	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	2016-11-24 18:05:43 +08:00
winlin	6dfb44b7b5	Merge branch '2.0release' into develop	2016-11-15 10:43:42 +08:00
winlin	85a7cb884f	fix bug: fix the way calculating PCR for ts(#678) (#430)	2016-11-15 10:42:02 +08:00
hankun	e0ab8b080d	fix bug: fix the way calculating PCR for ts(#678)	2016-11-09 10:14:12 +08:00
winlin	0a8d40925f	merge from 2.0	2016-11-09 09:44:19 +08:00
winlin	625ca23739	release r2.0b2, 2.0.221	2016-11-09 09:43:51 +08:00
winlin	d8599a56ca	fix #654, crash when source cleanup for edge. 2.0.221	2016-11-05 10:48:49 +08:00
ME_Kun_Han	f107f404ea	fix bug for issues #654 (#426)	2016-11-05 10:46:24 +08:00
winlin	2f5f7d4a7b	merge srs2	2016-10-26 09:55:24 +08:00
winlin	8b00e56a84	fix #666, crash when source cleanup for http-flv. 2.0.220	2016-10-26 09:54:49 +08:00
winlin	5796e4bf89	merge from srs2	2016-10-26 09:53:27 +08:00
winlin	b007350371	Merge pull request #392 from SnailTowardThesun/2.0release ... fix the bug: when trying to push same stream more than twice, to play…	2016-10-26 09:50:00 +08:00
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	2016-10-20 10:49:59 +08:00
winlin	112d98ffdb	merge srs2.	2016-10-10 11:56:10 +08:00
winlin	d6fc289c6a	fix #661, close fd after thread stopped. 2.0.219	2016-10-10 11:54:08 +08:00
ME_Kun_Han	7058411cb8	fix the core dump when trying to close srs (#386)	2016-10-10 11:51:49 +08:00
winlin	7deda9370c	Merge branch '2.0release' into develop	2016-09-27 14:55:07 +08:00
winlin	fba70afcc3	update circleci without ssl.	2016-09-27 14:50:24 +08:00
winlin	78aa518ecc	merge srs2	2016-09-27 11:00:13 +08:00
winlin	b19702f669	update srs player	2016-09-27 10:58:04 +08:00
winlin	9cc528cd33	merge srs2	2016-09-23 15:47:17 +08:00
winlin	3659eec9d1	update the cwd	2016-09-23 15:37:51 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	2016-09-23 15:17:46 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	b5d466f3d2	update utest	2016-09-15 14:47:42 +08:00
winlin	0fb71281a9	add circleci	2016-09-15 14:28:54 +08:00
winlin	9bd2ff16e2	add badage	2016-09-15 14:17:33 +08:00
winlin	cbffe74494	add circleci	2016-09-15 14:15:49 +08:00
winlin	e15e07c4d1	merge srs2	2016-09-15 13:39:25 +08:00
winlin	ff3f8272a9	fix #640, typo for rtmp type. 2.0.217	2016-09-15 13:37:11 +08:00
winlin	0596550a72	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00
winlin	99d87f9f9c	fix sys-ssl librtmp build bug.	2016-09-15 13:17:58 +08:00
winlin	4bcd90d747	fix sys-ssl librtmp build bug.	2016-09-15 13:11:42 +08:00
winlin	92fb81003c	link crypto when use sys-ssl	2016-09-15 12:59:34 +08:00
winlin	77bca7cc05	Merge branch '2.0release' into develop	2016-09-13 18:08:19 +08:00
winlin	53d2eb5e02	fix librtmp get bytes bug.	2016-09-13 18:08:12 +08:00
winlin	6b8fe92afa	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
winlin	588de3e7b4	check lsb_realease for install	2016-09-13 15:53:34 +08:00
winlin	504352d17a	merge srs2.	2016-09-12 18:21:44 +08:00