winlin 114f4447bb Merge branch '2.0release' into develop		2015-04-21 18:18:59 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
conf	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
doc	for #328, add hds specification.	2015-03-12 11:36:12 +08:00
etc/init.d	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:06:59 +08:00
ide	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	merge from github	2015-04-20 11:28:46 +08:00
scripts	remove the sudo of log.	2015-03-20 15:10:17 +08:00
src	Merge branch '2.0release' into develop	2015-04-21 18:18:59 +08:00
configure	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00