4062 commits

Author	SHA1	Message	Date
winlin	45d9018051	Merge branch '2.0release' into develop	2015-03-21 10:25:09 +08:00
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
winlin	3ca906d560	Merge branch '2.0release' into develop	2015-03-20 15:10:34 +08:00
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	2015-03-19 21:08:42 +08:00
winlin	b1142d83fc	Merge branch '2.0release' into develop	2015-03-19 17:24:37 +08:00
winlin	0319e85f99	support config the audio overflow ratio.	2015-03-19 17:24:27 +08:00
winlin	b7138ba9c5	merge from 2.0	2015-03-19 10:17:51 +08:00
tufang14	e319da3329	小瑕疵 ... 小瑕疵	2015-03-19 10:16:58 +08:00
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	2015-03-18 22:30:17 +08:00
winlin	4a50bf1894	Merge branch '2.0release' into develop	2015-03-18 16:50:54 +08:00
winlin	fbd722bf76	refine the fast buffer to more readable.	2015-03-18 16:50:47 +08:00
winlin	d25eb0aaa2	merge from 2.0	2015-03-18 16:35:24 +08:00
winlin	f36e4a443d	refine the fast buffer. 2.0.144	2015-03-18 16:34:27 +08:00
winlin	6a98758435	revert the changes for SRS2.	2015-03-17 23:51:10 +08:00
winlin	df2644c850	merge from 2.0release	2015-03-17 23:48:50 +08:00
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	2015-03-17 23:46:09 +08:00
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	2015-03-17 22:36:04 +08:00
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	2015-03-17 22:35:47 +08:00
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:07:38 +08:00
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:06:59 +08:00
tufang14	1cc3384a19	seg fault ... seg fault	2015-03-17 17:45:20 +08:00
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	2015-03-17 15:37:03 +08:00
winlin	8a4312f4ec	fix bug, use size_t for string::npos	2015-03-17 15:36:12 +08:00
winlin	9e407d32fe	change verstion to 3.0.0	2015-03-17 07:58:38 +08:00
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	2015-03-17 07:57:58 +08:00
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	2015-03-13 02:01:24 +08:00
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	2015-03-13 01:32:51 +08:00
wenjie.zhao	10da182853	add hls prefix of uri supported	2015-03-13 00:22:55 +08:00
wenjie.zhao	efe3050d7a	fix hls muxer Segmentation fault.	2015-03-12 23:50:21 +08:00
wenjie.zhao	73f13dfc42	fix hls muxer Segmentation fault.	2015-03-12 23:39:44 +08:00
winlin	9a0a8affc5	Merge pull request #337 from tufang14/develop ... 可能数组越界	2015-03-16 16:02:06 +08:00
winlin	685a29af83	Merge branch '2.0release' into develop	2015-03-16 15:45:01 +08:00
winlin	c92d40e00b	for #334, refine code, use kbps instead skt of rtmp connection.	2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	2015-03-16 15:39:49 +08:00
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	2015-03-16 15:35:01 +08:00
tufang14	6cf5a6a7a9	可能数组越界 ... 可能数组越界	2015-03-16 15:08:17 +08:00
winlin	67671e43f9	Merge branch '2.0release' into develop	2015-03-16 10:24:25 +08:00
winlin	8ee0826e9a	fix build failed bug.	2015-03-16 10:24:19 +08:00
winlin	a21243ea12	merge from 2.0	2015-03-15 08:16:37 +08:00
winlin	d349a3dbda	update stable version check	2015-03-15 08:15:04 +08:00
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	2015-03-15 08:06:41 +08:00
winlin	e6058c1560	update donation	2015-03-14 20:25:21 +08:00
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	2015-03-14 20:07:56 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	995b130090	for #324, refine code for hstrs, support hijack handler.	2015-03-14 14:55:45 +08:00
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +08:00
winlin	a15ce1147f	for #155, fix all warnings for mac.	2015-03-13 12:53:01 +08:00
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +08:00
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	2015-03-12 11:52:35 +08:00