2876 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	2015-03-30 12:44:04 +08:00
winlin	922adaf59f	Merge branch '2.0release' into develop	2015-03-29 22:35:10 +08:00
winlin	85afb6ea6f	add donation. fix bug of adts.	2015-03-29 22:34:53 +08:00
winlin	01ee456649	fix the ts parse bug, should never complete message when PES packet length is 0.	2015-03-27 15:27:10 +08:00
winlin	75ca70c619	Merge branch '2.0release' into develop	2015-03-26 19:58:27 +08:00
tufang14	0faaa61be7	seg fault ... seg fault	2015-03-26 19:57:51 +08:00
winlin	a5c5befad1	for parse video ts.	2015-03-26 19:52:21 +08:00
winlin	896983c1dc	refine the aac codec enum name	2015-03-26 11:31:40 +08:00
winlin	1401f2e0ab	ignore when sps/pps consumed all frame.	2015-03-26 11:07:45 +08:00
winlin	12d5431f3b	Merge branch '2.0release' into develop	2015-03-26 10:31:19 +08:00
winlin	b319e9ff9c	ignore when sps/pps consumed all frame.	2015-03-26 10:31:13 +08:00
winlin	c250e3e651	Merg branch '2.0release' into develop	2015-03-25 20:39:01 +08:00
winlin	e818f36316	fix #360, fix build bug for centos7.	2015-03-25 20:38:51 +08:00
winlin	713cedfbb4	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:14:29 +08:00
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	d16ae193f6	Merge branch '2.0release' into develop	2015-03-23 22:06:25 +08:00
winlin	fcab17741c	fix #222, the dvr path rule changed.	2015-03-23 22:06:18 +08:00
winlin	df3f24403e	Merge branch '2.0release' into develop	2015-03-23 21:21:42 +08:00
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:21:36 +08:00
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