2807 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:35 +08:00
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:04 +08:00
winlin	09ce6651eb	Merge branch '2.0release' into develop	2015-03-23 17:49:52 +08:00
winlin	1cb2992808	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
winlin	0a7b179e14	Merge branch '2.0release' into develop	2015-03-21 15:38:29 +08:00
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	2015-03-21 15:38:22 +08:00
winlin	e7e17cf15d	fix osx bug.	2015-03-21 15:24:26 +08:00
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	2015-03-21 15:22:45 +08:00
winlin	4d27030c19	Merge branch '2.0release' into develop	2015-03-21 12:19:06 +08:00
winlin	6776065b04	big support from all friends of SRS	2015-03-21 12:18:58 +08:00
winlin	e45c62003a	Merge branch '2.0release' into develop	2015-03-21 11:55:35 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	7065db192c	for #354, remove the double underscore of macro.	2015-03-21 10:42:55 +08:00
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	014993ad1e	remove the sudo of log.	2015-03-20 15:10:17 +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	196e1c50ba	for SRS3.	2015-03-17 23:57:05 +08:00
winlin	11b93803de	revert to SRS2.	2015-03-17 23:55:56 +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	9ed0da24d3	Merge branch 'tufang14-develop' into 2.0release	2015-03-17 23:46:25 +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
winlin	a28c051c2c	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
winlin	f3e5431d0f	check what a fuck os for some fresh.	2015-03-17 21:12:30 +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
winlin	1a12ff0d94	Merge branch 'wenjiegit-develop' into 2.0release	2015-03-17 07:45:44 +08:00
winlin	9c43c73d86	Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop	2015-03-17 07:45:27 +08:00
winlin	33e579599c	refine build for osx	2015-03-16 22:25:59 +08:00
winlin	806b45e844	Merge branch 'wenjiegit-develop' into 2.0release	2015-03-16 17:34:04 +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