winlin 78aa518ecc merge srs2		2016-09-27 11:00:13 +08:00
..
api-server	Merge branch '2.0release' into develop	2016-01-31 22:47:48 +08:00
arm	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
code-statistic	update 2015 to 2016	2015-12-23 11:41:41 +08:00
ffempty	update 2015 to 2016	2015-12-23 11:41:41 +08:00
golang	refine srs player to play hls.	2016-03-19 19:11:31 +08:00
gperftools	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
hls	update 2015 to 2016	2015-12-23 11:41:41 +08:00
librtmp	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00
players	merge srs2	2016-09-27 11:00:13 +08:00
python-subprocess	finish the research for python-subprocess	2014-06-11 11:14:43 +08:00
st	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00