3311 Commits (d1de097f5e9f9baf190143f6577f084760d74645)

 

All Branches   

Search

Author	SHA1	Message	Date
winlin	d16ae193f6	Merge branch '2.0release' into develop	10 years ago
winlin	fcab17741c	fix #222, the dvr path rule changed.	10 years ago
winlin	df3f24403e	Merge branch '2.0release' into develop	10 years ago
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	09ce6651eb	Merge branch '2.0release' into develop	10 years ago
winlin	1cb2992808	refine build for modules, add defines.	10 years ago
winlin	0a7b179e14	Merge branch '2.0release' into develop	10 years ago
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	10 years ago
winlin	e7e17cf15d	fix osx bug.	10 years ago
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	10 years ago
winlin	4d27030c19	Merge branch '2.0release' into develop	10 years ago
winlin	6776065b04	big support from all friends of SRS	10 years ago
winlin	e45c62003a	Merge branch '2.0release' into develop	10 years ago
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	10 years ago
winlin	7065db192c	for #354, remove the double underscore of macro.	10 years ago
winlin	45d9018051	Merge branch '2.0release' into develop	10 years ago
winlin	c6817cc422	for #354, remove the double underscore of macro.	10 years ago
winlin	3ca906d560	Merge branch '2.0release' into develop	10 years ago
winlin	014993ad1e	remove the sudo of log.	10 years ago
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	10 years ago
winlin	b1142d83fc	Merge branch '2.0release' into develop	10 years ago
winlin	0319e85f99	support config the audio overflow ratio.	10 years ago
winlin	b7138ba9c5	merge from 2.0	10 years ago
tufang14	e319da3329	小瑕疵 ... 小瑕疵	10 years ago
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	10 years ago
winlin	4a50bf1894	Merge branch '2.0release' into develop	10 years ago
winlin	fbd722bf76	refine the fast buffer to more readable.	10 years ago
winlin	d25eb0aaa2	merge from 2.0	10 years ago
winlin	f36e4a443d	refine the fast buffer. 2.0.144	10 years ago
winlin	196e1c50ba	for SRS3.	10 years ago
winlin	11b93803de	revert to SRS2.	10 years ago
winlin	6a98758435	revert the changes for SRS2.	10 years ago
winlin	df2644c850	merge from 2.0release	10 years ago
winlin	9ed0da24d3	Merge branch 'tufang14-develop' into 2.0release	10 years ago
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	10 years ago
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	10 years ago
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	10 years ago
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	a28c051c2c	osx support build nginx and ffmpeg	10 years ago
winlin	f3e5431d0f	check what a fuck os for some fresh.	10 years ago
tufang14	1cc3384a19	seg fault ... seg fault	10 years ago
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	10 years ago
winlin	8a4312f4ec	fix bug, use size_t for string::npos	10 years ago
winlin	9e407d32fe	change verstion to 3.0.0	10 years ago
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	10 years ago
winlin	1a12ff0d94	Merge branch 'wenjiegit-develop' into 2.0release	10 years ago
winlin	9c43c73d86	Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop	10 years ago