6836 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	6e75993e7f	Change public virtual to virtual public	2018-12-23 19:54:08 +08:00
winlin	5d959661e7	No sudoer	2018-12-22 20:51:57 +08:00
winlin	2e9bf2af83	Always enable SRS_StreamCaster	2018-12-22 20:45:25 +08:00
winlin	0d5c86853a	Merge branch 3.0release into develop	2018-12-22 20:32:23 +08:00
winlin	1dc95cba78	Always enable SRS_Ingest	2018-12-22 20:31:47 +08:00
winlin	aa1a5442f9	Always enable SRS_Ingest	2018-12-22 20:30:13 +08:00
winlin	c6844527fb	Always enable SRS_SSL	2018-12-22 20:23:39 +08:00
winlin	e4e6dd2169	Always enable SRS_SSL	2018-12-22 20:08:42 +08:00
winlin	0bc7fdbb35	Always enable SRS_SSL	2018-12-22 20:03:40 +08:00
winlin	8e294709b0	Always enable SRS_STAT	2018-12-22 19:58:36 +08:00
winlin	71f1ccbf90	Always enable SRS_HLS	2018-12-22 19:54:10 +08:00
winlin	f003ba9a29	Always enable SRS_DVR	2018-12-22 19:50:57 +08:00
winlin	330100769f	Always enable SRS_TRANSCODE	2018-12-22 19:48:55 +08:00
winlin	12f9614117	Merge branch '3.0release' into develop	2018-12-16 23:55:05 +08:00
winlin	59d8bb532b	Add git	2018-12-16 23:54:44 +08:00
winlin	7ee3dad2f9	Update readme	2018-12-16 23:39:45 +08:00
winlin	0626bc5982	Use openssl in docker	2018-12-10 14:27:55 +08:00
winlin	432a575c7a	Use docker for #1274 and #1250	2018-12-10 00:07:38 +08:00
winlin	b0e91e8fe9	Use docker for #1274 and #1250	2018-12-10 00:05:23 +08:00
winlin	f1ab8fecac	Fix build warning	2018-12-09 22:48:47 +08:00
winlin	ef3e35f173	Fix build warning	2018-12-09 21:04:43 +08:00
winlin	4d157f2148	Fix build warning	2018-12-09 21:00:38 +08:00
winlin	dcc2a73e7a	Refine kernel aac	2018-12-09 20:58:40 +08:00
winlin	572a2806c1	Refine utest	2018-12-09 20:36:31 +08:00
winlin	a8be5f8f27	Allow OSX for utest	2018-12-09 19:41:59 +08:00
winlin	f2a93755c2	Allow OSX for utest	2018-12-09 19:39:36 +08:00
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	2018-12-01 20:21:35 +08:00
winlin	acaae0d5c9	Update SRS3	2018-11-27 21:45:57 +08:00
winlin	ba4ef34d27	Merge 2.0release	2018-11-27 21:24:51 +08:00
Steven Liu	78cf3d4b58	upgrade x264 and ffmpeg to newest version (#1274) ... The ffmpeg and x264 in srs is too old. Signed-off-by: Steven Liu lq@chinaffmpeg.org Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	2018-11-27 21:17:42 +08:00
winlin	ff82ca1233	Merge branch 2.0release into 3.0release	2018-11-11 16:24:09 +08:00
winlin	99430d2edb	For #1250, Not support macOS 10.14	2018-11-11 16:24:00 +08:00
winlin	24f46f5085	#1261, Support _definst_ for Wowza. 3.0.44	2018-11-11 13:51:10 +08:00
winlin	99aa249f3a	#1261, Support _definst_ for Wowza. 2.0.260	2018-11-11 13:33:47 +08:00
MakarovYaroslav	e62ac29f48	add ignoring _definst_ at the end of app (#1261)	2018-11-11 13:31:29 +08:00
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	2018-11-11 13:30:12 +08:00
MakarovYaroslav	a2480a6c94	fix bug with for loop (#1263)	2018-11-11 13:27:33 +08:00
winlin	39f1629168	Merge from SRS2	2018-10-28 14:24:18 +08:00
winlin	4cb8de3029	Release r2.0r5, 2.0.258	2018-10-28 14:18:36 +08:00
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	2018-10-28 14:09:55 +08:00
winlin	63ac93a642	Merge #1236 from 2.0release	2018-10-08 07:22:21 +08:00
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	2018-10-08 07:16:07 +08:00
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	2018-10-08 07:14:14 +08:00
winlin	3f009937ee	Merge #1237 from 2.0release	2018-10-08 07:10:29 +08:00
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	2018-10-08 07:09:31 +08:00
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	2018-10-08 07:01:49 +08:00
winlin	580b94c9c8	SRS console support both Chinese and English	2018-08-26 19:38:46 +08:00
winlin	8e55ef4b60	Refine code	2018-08-26 14:29:45 +08:00
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	2018-08-25 21:59:56 +08:00
winlin	37bc0a253d	Merge branch harlanc-3.0release into 3.0release	2018-08-25 21:17:46 +08:00