3875 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	c2cb666995	fix fast stream error bug. 2.0.216	2016-09-12 18:21:14 +08:00
winlin	c231f45fe8	Merge branch '2.0release' into develop	2016-09-09 14:57:58 +08:00
winlin	4e756bd0eb	refine readme	2016-09-09 14:52:35 +08:00
winlin	bd652e4607	fix build failed for stdc++	2016-09-09 14:41:02 +08:00
winlin	66f251c6be	update readme	2016-09-09 14:33:07 +08:00
winlin	4af1299e08	refine readme	2016-09-09 14:32:26 +08:00
winlin	b14ae72c8a	update binary	2016-09-09 14:31:28 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
winlin	6c4c68ccb6	2.0 beta1(2.0.215) released.	2016-09-09 14:26:16 +08:00
winlin	49b880d4ce	refine comments	2016-09-09 14:18:50 +08:00
winlin	eb915413ad	Merge branch '2.0release' into develop	2016-09-09 14:14:22 +08:00
winlin	0015b303a6	librtmp: refine comment for NALU process.	2016-09-09 14:14:12 +08:00
winlin	93eb961b4c	Merge branch '2.0release' into develop	2016-09-09 11:33:58 +08:00
winlin	4c6c2c28b8	refine h264 raw publish with fps	2016-09-09 11:32:24 +08:00
winlin	09895fcfc2	Merge branch '2.0release' into develop	2016-09-09 11:03:39 +08:00
winlin	4fe1eca09c	Merge pull request #638 from m13253/2.0release ... Flush the stdout buffer after logging to console	2016-09-09 11:02:52 +08:00
winlin	4342d3ed18	Merge branch '2.0release' into develop	2016-09-09 10:59:24 +08:00