winlin 90cd16aae4 Merge branch '2.0release' into develop		2015-04-03 14:36:09 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
conf	for hls callback, add duration of ts.	2015-04-03 13:46:44 +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	fix compile errors.	2015-04-03 11:30:59 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	for hls callback, add duration of ts.	2015-04-03 13:46:44 +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-03 14:36:09 +08:00
configure	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00