1260 commits

Author	SHA1	Message	Date
winlin	c67fe0323b	Refine product target	2018-01-07 10:51:18 +08:00
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	2018-01-04 13:49:55 +08:00
winlin	a6bc53cb85	Merge #1039, fix bug of init.d script.	2018-01-04 13:49:11 +08:00
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	2018-01-01 23:03:42 +08:00
winlin	b426036832	Merge #1033, allow user to add some specific flags. 2.0.244	2018-01-01 23:01:13 +08:00
winlin	59b53dab8b	Merge from SRS2	2017-09-22 16:27:24 +08:00
winlin	a1df3c6f36	Remove CSDN mirror	2017-09-22 16:23:04 +08:00
winlin	b88265fc78	Update readme	2017-07-26 09:28:40 +08:00
winlin	ba2b82f29c	Refine English of Readme	2017-07-24 08:45:36 +08:00
winlin	1d35ae21ec	Update README.md	2017-06-30 10:30:16 +08:00
winlin	4d6c1b1a17	Update README.md	2017-06-29 09:38:20 +08:00
winlin	9c6d7a71d0	Update README.md	2017-06-29 09:38:03 +08:00
winlin	535fa034af	Update README.md	2017-06-29 09:37:16 +08:00
winlin	ad6f318ea6	Update README.md	2017-06-29 09:35:57 +08:00
winlin	92fb9b4a72	Update README.md	2017-06-28 09:54:14 +08:00
winlin	f871c26380	Update README.md	2017-06-28 09:38:05 +08:00
winlin	2207adebed	Update README.md	2017-06-28 09:27:45 +08:00
winlin	ec335c692d	Update README.md	2017-06-28 09:23:42 +08:00
winlin	6749582f1e	Update README.md	2017-06-28 09:21:06 +08:00
winlin	a5925ca904	Update README.md	2017-06-28 09:19:09 +08:00
winlin	159ef9e1c4	Update README.md	2017-06-28 09:18:13 +08:00
winlin	f9056caae0	Merge branch 'develop' into 3.0release	2017-06-28 09:09:00 +08:00
winlin	494879f6ed	Update README.md	2017-06-27 08:26:02 +08:00
winlin	f641f06171	Update README.md	2017-06-27 08:19:48 +08:00
winlin	34c73b6bec	Update README.md	2017-06-27 08:15:39 +08:00
winlin	9ae54850bf	Update readme for json	2017-06-11 14:06:54 +08:00
winlin	4e4091231e	Refine object create in server.	2017-06-10 14:19:10 +08:00
winlin	c32afb95ab	Release v2.0-r2, 2.0.243	2017-06-10 09:02:16 +08:00
winlin	e309be154e	Release v2.0-r2, 2.0.243	2017-06-10 08:59:14 +08:00
winlin	20cacd5ea0	Update readme for DASH	2017-06-10 08:54:59 +08:00
winlin	58521751c3	Fix #299, support experimental MPEG-DASH. 3.0.25	2017-06-04 19:56:29 +08:00
winlin	6c64297264	Fix #821, support MP4 file parser. 3.0.24	2017-05-30 19:40:03 +08:00
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	2017-05-30 09:05:02 +08:00
winlin	54411e0768	Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23	2017-05-30 07:40:18 +08:00
winlin	5792c462b8	Merge branch 'develop' into 3.0release	2017-05-29 12:17:25 +08:00
winlin	c4966484e1	For #893, #899, merge SRS2	2017-05-29 12:17:16 +08:00
winlin	e8cb2e6be4	Merge #899 to fix #893, ts PES ext length. 2.0.243	2017-05-29 12:15:04 +08:00
winlin	2677ec8c3f	Update license mixing	2017-05-24 14:14:45 +08:00
winlin	f97260be1d	Merge SRS2	2017-05-01 16:44:14 +08:00
winlin	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	2017-05-01 16:39:59 +08:00
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	2017-04-30 12:03:31 +08:00
winlin	c97f2233a2	Merge SRS2 for #851	2017-04-23 21:00:06 +08:00
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	2017-04-23 20:55:51 +08:00
winlin	d0bf47906d	Merge SRS2	2017-04-18 21:11:36 +08:00
winlin	4167715153	Release 2.0r1, 2.0.239	2017-04-18 21:08:31 +08:00
winlin	d15c21a034	Merge branch '2.0release' into develop	2017-04-18 11:51:25 +08:00
winlin	f2dd866c78	Fix typo of Readme.	2017-04-18 11:51:19 +08:00
winlin	9a2a6ab95f	Merge SRS2	2017-04-18 11:42:11 +08:00
winlin	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	2017-04-18 11:41:09 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00