3582 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
没——问题	e8680527c3	allow domain * ... 在使用时，srs_player可能和所在页面部署在不同的域名下。 所以在此处添加跨域许可。	2015-09-17 12:09:29 +08:00
winlin	7b2b11e932	async call worker fast execute tasks.	2015-09-17 11:57:17 +08:00
没——问题	c548ab5019	function set_srs_player_url(url, params) ... 在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。 所以在此处提供设置 srs_player.swf 的url的方法。	2015-09-17 11:44:45 +08:00
winlin	087f7740b7	fix the build failed bug	2015-09-17 11:41:23 +08:00
winlin	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +08:00
winlin	240a1bfadb	rename kafka protocol	2015-09-16 13:56:52 +08:00
winlin	c4e4711b93	add kafka protocol	2015-09-16 13:55:11 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2b9869ee52	update the wiki for dvr	2015-09-15 17:58:35 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +08:00
winlin	e8a00de4a3	for #319, support enable or disable vhost.	2015-09-15 12:51:14 +08:00
winlin	631e76cd32	for #319, support update and delete the disabled vhost	2015-09-15 12:15:18 +08:00
winlin	95979674f9	merge srs 2	2015-09-14 21:09:34 +08:00
winlin	2c21f74efb	update readme.	2015-09-14 21:08:19 +08:00
winlin	a865eb9ccb	merge from srs2	2015-09-14 20:58:54 +08:00
winlin	1d477ae71b	srs 2.0 alpha1 released. 89269 lines.	2015-09-14 20:48:32 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	eb578b4a39	refine the thread, set to disposed when terminate normally	2015-09-14 17:17:38 +08:00
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	2015-09-14 15:49:25 +08:00
winlin	44bcb4045f	for #474, decode the sequence header before hls.	2015-09-14 15:32:09 +08:00
winlin	07ef8160a3	clear the queue when edge republish.	2015-09-14 15:25:01 +08:00
winlin	704624c9ec	clear the queue when edge republish.	2015-09-14 15:19:49 +08:00
winlin	8be3c875af	donot release stream when busy	2015-09-14 15:17:59 +08:00
winlin	3da25f3aee	when thread terminated normally, set the tid to NULL.	2015-09-14 15:11:49 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	eb9aa47ab1	merge from 2.0	2015-09-14 13:48:27 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	3b483094bd	merge from 2.0	2015-09-14 12:24:57 +08:00
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
winlin	adb74dc74e	Merge branch '2.0release' into develop	2015-09-14 11:17:19 +08:00
winlin	f0fc093b19	fix the http zero content length bug.	2015-09-14 11:17:04 +08:00
winlin	ad6de898a5	Merge branch '2.0release' into develop	2015-09-14 09:29:09 +08:00
winlin	d07bfa459a	update donation	2015-09-14 09:28:47 +08:00
winlin	88e7e1c784	update donation.	2015-09-14 09:08:01 +08:00
winlin	0038c9a88d	Merge branch '2.0release' into develop	2015-09-13 18:16:07 +08:00
winlin	1518ea6142	update donation	2015-09-13 18:15:51 +08:00
winlin	589d430086	Update README.md	2015-09-13 18:14:56 +08:00
winlin	61d817bad5	Update README.md	2015-09-13 18:07:26 +08:00
winlin	00fef04bcd	merge from 2.0	2015-09-13 18:06:21 +08:00
winlin	f9228464b6	update donation	2015-09-13 17:59:37 +08:00
winlin	f09019ea0d	update donation	2015-09-13 17:57:40 +08:00
winlin	01308ecc98	for #319, support initialize the parser to whether use jsonp	2015-09-12 22:22:33 +08:00
winlin	491ec11833	for #319, raw api support add new vhost	2015-09-12 21:55:53 +08:00
winlin	0d6c24581d	refine json number, use int64 when number is int.	2015-09-12 16:36:29 +08:00
winlin	7ae76b579e	refine the conf, use srs3 style	2015-09-11 08:21:06 +08:00
winlin	77d21f7e32	refine readme, fix typo	2015-09-11 08:02:45 +08:00
winlin	6931bdd6d5	refine readme, the module and arch	2015-09-11 08:00:16 +08:00
winlin	d76eda35ab	refine readme, add exec for stream arch	2015-09-11 07:47:40 +08:00