2572 commits

Author	SHA1	Message	Date
winlin	304ff02aef	default to 30s timeout for librtmp	2016-08-10 22:29:56 +08:00
winlin	02fb0779be	fix the microsec calc bug for librtmp	2016-08-10 22:13:24 +08:00
winlin	e00928557e	fix the timeout for librtmp	2016-08-10 22:04:01 +08:00
intliang	3fbe9d2442	fixed crash by improper srs_info use.	2016-08-08 14:07:19 +08:00
winlin	f87646d489	fix typo of config.	2016-08-08 13:58:42 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
weiyabo	8df7135dee	for bug #5064, success parse 264 sps	2016-05-17 10:53:56 +08:00
winlin	d72b93e58b	fix the sed bug, to compatible with osx	2016-03-03 10:57:26 +08:00
winlin	f7d9ed5ae4	update api	2016-01-31 21:49:53 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	2016-01-09 16:00:58 +08:00
tufang14	56bffb6646	Update srs_app_thread.cpp	2016-01-09 15:54:23 +08:00
flowerwrong	d42a58faf4	Keep blank of line	2016-01-09 15:10:24 +08:00
tufang14	233ff11172	srs reusable thread need join	2016-01-09 14:58:40 +08:00
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	2016-01-08 15:10:25 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	2015-12-22 16:48:06 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	26d328e7f2	fix bug for api, level should be string.	2015-12-14 18:43:20 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +08:00
winlin	c77cefb6fa	refine the position of log script	2015-11-11 17:49:46 +08:00
winlin	c4c63f7825	fix build failed bug for osx.	2015-11-11 17:06:12 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	2015-11-10 12:16:01 +08:00
winlin	8c04b17d08	use /usr/local/bin for osx.	2015-11-10 12:03:52 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	98e25def6c	fix utest build failed for osx.	2015-11-05 15:11:59 +08:00
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	2015-11-05 14:37:21 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	ec225b2108	quit child process when fork failed.	2015-11-02 11:46:33 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	50a7b9c1ff	for ExoPlayer, add av tag in flv header. 2.0.197	2015-10-28 11:01:20 +08:00
winlin	3b0bf1e10b	for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.	2015-10-27 18:20:57 +08:00