winlin 9528243b81 Merge branch '2.0release' into develop		2015-08-21 13:43:40 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
conf	support publish_1stpkt_timeout and publish_normal_timeout	2015-08-19 16:16:05 +08:00
doc	for #328, add hds specification.	2015-03-12 11:36:12 +08:00
etc/init.d	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +08:00
ide	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	srs player show current time and url	2015-08-20 18:33:33 +08:00
scripts	fix the test configure script	2015-05-27 11:38:10 +08:00
src	Merge branch '2.0release' into develop	2015-08-21 13:43:40 +08:00
configure	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00