3561 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	a0c6e4ee8c	refine readme, add exec for stream arch	2015-09-11 07:47:08 +08:00
winlin	9d85025114	Update README.md	2015-09-11 07:38:58 +08:00
winlin	db1ed513be	Update README.md	2015-09-11 07:37:57 +08:00
winlin	d56b9fd90f	refine readme	2015-09-11 07:35:42 +08:00
winlin	a88f321d8b	for #319, merge from 2.0release	2015-09-09 23:41:11 +08:00
winlin	abd7ee227c	support reload utc_time. 2.0.186	2015-09-09 23:37:07 +08:00
winlin	c4feb8f6ed	for #319, raw api support update all globals.	2015-09-09 23:32:02 +08:00
winlin	6aafd072db	for #319, raw api support update srs log tank, level and file.	2015-09-09 22:44:34 +08:00
winlin	8107e5f9a6	for #319, raw api support set the ff_log_dir	2015-09-09 21:46:29 +08:00
winlin	c8466c36bd	for #319, raw api support update the global RTMP chunk_size.	2015-09-01 21:27:04 +08:00
winlin	2cfb71616e	for #319, copy all data to request for source.	2015-09-01 18:52:29 +08:00
winlin	2bdd974227	for #319, reorder the ingesters.	2015-09-01 18:41:30 +08:00
winlin	342483bf04	for #319, when reload the listen, restart all ingesters.	2015-09-01 18:39:14 +08:00
winlin	310b5a14cb	for #319, support minimal query api	2015-09-01 13:33:49 +08:00
winlin	06c7ae62ee	for #319, refine the error code for RAW APi.	2015-09-01 12:27:53 +08:00
winlin	11c409688b	for #319, http raw api support query. 3.0.3	2015-08-31 23:34:03 +08:00
winlin	8a2709dd2c	for #319, do not apply when config not changed.	2015-08-31 12:06:22 +08:00
winlin	a62c82bd46	for #319, api raw update global.listen	2015-08-30 23:42:21 +08:00
winlin	364460f2ab	for #319, support raw update global.listen	2015-08-30 23:18:14 +08:00
winlin	f8d8c3ace4	use function to dumps the engine.	2015-08-30 23:08:27 +08:00
winlin	01878e5a9c	for #319, query vhost detail.	2015-08-30 22:23:47 +08:00