winlin 0b84c1d962 Merge branch '2.0release' into develop		2015-08-12 18:02: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	refine config.	2015-08-12 18:02:31 +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	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
scripts	fix the test configure script	2015-05-27 11:38:10 +08:00
src	merge from 2.0	2015-08-12 13:23:00 +08:00
configure	use local openssl header files to avoid warnings on osx.	2015-07-06 10:32:28 +08:00