winlin ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common.		2017-01-11 17:43:29 +08:00
..
3rdparty	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
auto	refine hls html5 video template.	2017-01-10 18:43:36 +08:00
conf	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
doc	rename kafka protocol	2015-09-16 13:56:52 +08:00
etc/init.d	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
ide	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
modules	refine typo	2016-12-07 12:09:39 +08:00
research	merge srs2	2016-09-27 11:00:13 +08:00
scripts	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
src	merge srs2. convert ts aac audio private stream 1 to common.	2017-01-11 17:43:29 +08:00
.gitignore	update gitignore	2017-01-09 15:17:08 +08:00
configure	update gitignore	2017-01-09 15:17:08 +08:00