2227 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	b32d3fb6aa	remove the read and write with SrsStream.	2014-11-29 17:58:40 +08:00
winlin	6d49cddc9d	for bug #235, refine code order of c1s1 and c2s2	2014-11-29 17:05:54 +08:00
winlin	646d6f6673	for bug #235, refine schema0 and schema1, extract dup code.	2014-11-29 17:04:24 +08:00
winlin	4b9875e279	for bug #235, use strategy to implements the schema0 and schema1.	2014-11-29 16:17:07 +08:00
winlin	5d883e2e29	for bug #235, move functions of block and digest to struct.	2014-11-29 13:08:43 +08:00
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00
winlin	0d98dc88bf	Merge branch '1.0release'	2014-11-28 11:09:33 +08:00
winlin	0c132e9781	update the log position.	2014-11-28 10:58:16 +08:00
winlin	43309379d4	Merge branch '1.0release'	2014-11-28 10:52:26 +08:00
winlin	127b96b255	add git2unix and git commit script.	2014-11-28 10:42:47 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	2014-11-27 18:50:54 +08:00
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	2014-11-27 18:48:01 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	bb85a0c856	for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows.	2014-11-27 18:31:25 +08:00
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	2014-11-27 18:20:13 +08:00
winlin	904a06cadf	Merge branch '1.0release'	2014-11-27 17:47:23 +08:00
winlin	575e50b6e2	hotfix to add comments on 1.0release	2014-11-27 17:47:13 +08:00
winlin	9c0d02f6a7	merge from 1.0release to master(develop)	2014-11-27 17:35:46 +08:00
winlin	62b861718f	Revert "remove vs2010 files from master" ... This reverts commit f8a2c22f3a.	2014-11-27 17:02:30 +08:00
winlin	f8a2c22f3a	remove vs2010 files from master	2014-11-27 16:16:04 +08:00
winlin	b70bc74808	Merge branch 'allspace-master' into srs-librtmp	2014-11-27 15:29:41 +08:00
winlin	4c0c3a9ada	refine merged code for allspace.	2014-11-27 15:29:24 +08:00
winlin	468941833c	change srs version to 2.0.33	2014-11-27 15:23:16 +08:00
winlin	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	2014-11-27 14:46:05 +08:00
winlin	bb54194c26	checkout master	2014-11-27 12:53:21 +08:00
winlin	1ce79980b1	checkout master	2014-11-27 12:52:47 +08:00
winlin	c49981ed6f	refine script	2014-11-27 12:51:33 +08:00
winlin	b825ea62f9	refine comments	2014-11-27 12:50:04 +08:00
winlin	8766ab5de2	add git2unix script	2014-11-27 12:45:34 +08:00
winlin	be53b10ed3	refine log position	2014-11-27 08:04:39 +08:00
winlin	e76c53dae8	sleep when git commit failed.	2014-11-27 08:03:21 +08:00
winlin	ff73088091	fix bug of git commit	2014-11-27 08:02:17 +08:00
winlin	93ee15a552	udpate github commit to git commit	2014-11-27 08:00:11 +08:00
winlin	55461e866f	sync tags with csdn and oschina	2014-11-27 07:52:12 +08:00
winlin	131f598ab5	use multiple remote to commit and sync with csdn+oschina.	2014-11-27 07:47:39 +08:00
winlin	4c67ddca26	Merge branch 'srs.master'	2014-11-27 07:17:11 +08:00
winlin	6a5f405ba0	add github script	2014-11-27 07:02:54 +08:00
winlin	c6133213cf	Merge branch 'srs.1.0release' into 1.0release	2014-11-25 11:12:05 +08:00
winlin	ad8b63d228	Merge branch 'srs.master'	2014-11-25 11:11:57 +08:00
winlin	d91a9dfa9d	udpate the srs_bwt.	2014-11-25 11:10:54 +08:00
winlin	e11fa383ca	udpate the srs_bwt.	2014-11-25 11:09:28 +08:00
winlin	499277a00e	Merge branch 'srs.master'	2014-11-25 11:06:38 +08:00
winlin	02778dba4c	udpate the srs_bwt.	2014-11-25 11:05:45 +08:00
winlin	cb0620318c	Merge branch 'srs.master'	2014-11-25 11:01:48 +08:00
winlin	a2af051840	udpate the srs_bwt.	2014-11-25 10:59:38 +08:00
winlin	1c90b19035	Merge branch 'srs.1.0release' into 1.0release	2014-11-25 10:51:28 +08:00
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:59 +08:00
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:25 +08:00