8431 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	7bfa86de5a	Merge branch 'srs.master'	2014-11-05 17:13:18 +08:00
winlin	bba2d3dd98	research st: replace the TAB with 4spaces	2014-11-05 17:12:56 +08:00
winlin	760c37ae82	Merge branch 'srs.master'	2014-11-05 17:11:35 +08:00
winlin	55bd1dd95e	research st: replace the TAB with 4spaces	2014-11-05 17:10:54 +08:00
winlin	0faa38dc0c	research st: remove the osguess.sh	2014-11-05 17:06:18 +08:00
winlin	f3c7e354e7	Merge branch 'srs.master'	2014-11-05 17:02:27 +08:00
winlin	2dc6b7d1ea	add io for st research	2014-11-05 17:01:15 +08:00
winlin	ccb4c0d03f	Merge branch 'srs.master'	2014-10-27 12:57:04 +08:00
winlin	9d7e6b9bb2	update mirror utils	2014-10-27 12:56:04 +08:00
winlin	d004c30ef3	Merge branch 'srs.1.0release' into 1.0release	2014-10-27 12:55:05 +08:00
winlin	574f02fe72	Merge branch 'srs.master'	2014-10-27 12:55:02 +08:00
winlin	d88a2cc8dc	update readme	2014-10-27 12:18:50 +08:00
winlin	60ab365660	update mirror, use utils functions.	2014-10-27 12:03:56 +08:00
winlin	2175102ea2	remove the sync script for mirror, which maybe updated.	2014-10-27 11:41:28 +08:00
winlin	e104a18763	update sync script on master	2014-10-27 11:40:59 +08:00
winlin	74f7c32e81	update readme, add oschina mirror.	2014-10-27 11:35:09 +08:00
winlin	ff76afa81a	update readme	2014-10-27 11:34:05 +08:00
winlin	b8db8b0fa4	add oschina mirror	2014-10-27 11:32:34 +08:00
winlin	2f1a792ce8	Merge branch 'srs.1.0release' into 1.0release	2014-10-27 11:31:58 +08:00
winlin	610c36eaeb	Merge branch 'srs.master'	2014-10-27 11:31:39 +08:00
winlin	c69d523b39	remove license	2014-10-27 11:20:48 +08:00
winlinvip	bbb1e0bbbd	Initial commit	2014-10-27 11:12:48 +08:00
winlin	511c814ffb	refs #182: rename to sync test.	2014-10-26 16:38:00 +08:00
winlin	69fdec411f	refs #182: rename to sync test.	2014-10-26 16:35:12 +08:00
winlin	9aba47cbe3	refs #182: research st, add multiple threadds.	2014-10-26 14:04:31 +08:00
winlin	79ab9f05f3	refs #182: update the st, use cond and mutex.	2014-10-26 13:55:37 +08:00
winlin	388305f44c	update st research.	2014-10-26 13:43:11 +08:00
winlin	85c2398e78	update readme.	2014-10-25 17:16:38 +08:00
winlin	fb906f0afc	revert the player for bug #185.	2014-10-25 17:15:33 +08:00
winlin	6a3418cd45	fix #185, AMF0 support 0x0B the date type codec. 2.0.5.	2014-10-25 17:12:56 +08:00
winlin	05cce97140	for bug #186, read the args when discovery it. 2.0.6	2014-10-24 13:23:52 +08:00
winlin	3c31e6db05	for bug #186, read the args when discovery it. 1.0.4	2014-10-24 13:22:35 +08:00
winlin	e3e18b9915	for bug #186, read the args when discovery it. 1.0.4	2014-10-24 13:17:11 +08:00
winlin	7d70864b33	for bug #186, read the args when discovery it. 2.0.6	2014-10-24 13:16:08 +08:00
winlin	f4b779060b	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:36 +08:00
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:06 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	d8e55d14cd	rename EN/CN home	2014-10-24 11:10:41 +08:00
winlin	8295750821	rename EN/CN home	2014-10-24 11:10:30 +08:00
winlin	b65dfd718a	add comments for the RTMP packet fields, NULL or never NULL. 2.0.5	2014-10-24 10:58:06 +08:00
winlin	1bfc238fec	hotfix for bug #186, drop connect args when not object. 2.0.4.	2014-10-24 10:35:40 +08:00
winlin	aa98ca60b9	fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3.	2014-10-24 10:34:00 +08:00
winlin	77d14ff752	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 10:01:00 +08:00
winlin	a169262099	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 10:00:23 +08:00
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:58:53 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +08:00
winlin	b9b345ec37	update readme, ENHome_v1 to v1_ENHome	2014-10-24 09:44:05 +08:00
winlin	abe2779a37	update readme.	2014-10-21 09:46:40 +08:00
winlin	616d1cb2b3	update readme.	2014-10-20 09:52:19 +08:00
winlin	57e8356221	fix #184, support AnnexB in RTMP body for HLS. 2.0.2	2014-10-19 19:42:27 +08:00