1156 commits

Author	SHA1	Message	Date
winlin	750f4413c8	merge srs2 for #536	2017-01-16 12:47:48 +08:00
winlin	ccb250f3bc	merge srs2. convert ts aac audio private stream 1 to common.	2017-01-11 17:43:29 +08:00
winlin	e6eafd3b97	fix #740, convert ts aac audio private stream 1 to common. 2.0.229	2017-01-11 17:42:34 +08:00
winlin	c902d0eb01	no donation anymore.	2017-01-11 13:06:39 +08:00
winlin	f92db0f87e	merge srs2 for kbps	2017-01-11 11:46:50 +08:00
winlin	fec6f96a8f	fix link for readme	2017-01-11 11:44:51 +08:00
winlin	c58dbe4d14	fix #588, kbps interface error. 2.0.228	2017-01-11 11:22:16 +08:00
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	2017-01-11 09:45:22 +08:00
winlin	7bbb3bae42	merge srs2	2017-01-11 09:33:26 +08:00
winlin	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	2017-01-11 09:25:48 +08:00
winlin	db231f6d37	refine hls html5 video template.	2017-01-10 18:43:36 +08:00
winlin	087a596a63	refine hls html5 video template.	2017-01-10 18:43:10 +08:00
winlin	1dd877c0d6	merge srs2	2017-01-10 11:17:37 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +08:00
winlin	15dfb0957c	update introduction for SRS3	2017-01-06 19:02:49 +08:00
winlin	8017311369	update introduction for SRS3	2017-01-06 19:01:43 +08:00
winlin	463ff9374f	update introduction for SRS3	2017-01-06 18:50:56 +08:00
winlin	7119b2a31e	update introduction for SRS3	2017-01-06 18:50:22 +08:00
winlin	309abde790	merge srs2	2017-01-06 18:18:02 +08:00
winlin	ba1c92a7b1	update readme	2017-01-06 18:17:11 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	e434c09dc0	for #730, merge srs2	2017-01-06 14:13:19 +08:00
winlin	c67036d52e	for #730, reset ack follow flash player rules. 2.0.225	2017-01-06 14:04:34 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	35cd4c407c	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:50:02 +08:00
winlin	f9a159cd21	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
winlin	1581b15d86	update feature list	2017-01-05 10:10:27 +08:00
winlin	a4b82d7def	update feature list	2017-01-05 09:55:57 +08:00
winlin	0f95964a8e	update feature list	2017-01-05 09:32:24 +08:00
winlin	5a1b067fcf	update feature list	2017-01-05 09:31:14 +08:00
winlin	8bdf50b14d	update feature list	2017-01-05 09:29:12 +08:00
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	b4a815641b	refine the links	2017-01-04 17:50:06 +08:00
winlin	df8ad774ef	refine the content	2017-01-04 11:52:30 +08:00
winlin	704038e36e	refine the content	2017-01-04 11:49:31 +08:00
winlin	977f82ad1d	refine the content	2017-01-04 11:46:22 +08:00
winlin	6cf7089bae	refine the content	2017-01-04 11:45:45 +08:00
winlin	9b85d9fca5	refine the content	2017-01-04 11:45:22 +08:00
winlin	412f6f3b47	refine the content	2017-01-04 11:42:56 +08:00
winlin	85ceea1c98	refine the content	2017-01-04 11:34:59 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	fd693915c3	Merge branch '2.0release' into develop	2016-12-13 19:14:36 +08:00
winlin	34e5cdcd12	update latest srs2	2016-12-13 19:14:30 +08:00
winlin	c8aa34f0be	merge srs2	2016-12-13 19:08:09 +08:00
winlin	6d3184029a	release v2.0b3 2.0.223	2016-12-13 19:07:22 +08:00
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	2016-12-13 18:41:45 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00