winlin 3b483094bd merge from 2.0		2015-09-14 12:24:57 +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	refine the conf, use srs3 style	2015-09-11 08:21:06 +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	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	refine srs player, support set the bufferTimeMax.	2015-08-24 07:55:30 +08:00
scripts	refine commit script	2015-08-24 11:16:39 +08:00
src	merge from 2.0	2015-09-14 12:24:57 +08:00
configure	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00