292 commits

Author	SHA1	Message	Date
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	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	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	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	99430d2edb	For #1250, Not support macOS 10.14	2018-11-11 16:24:00 +08:00
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	2018-10-28 14:09:55 +08:00
winlin	6d4315fc3c	Disable valgrind by default	2017-06-28 09:08:19 +08:00
winlin	0ad4b65a56	Disable valgrind for osx.	2017-06-13 16:20:00 +08:00
winlin	33375db401	Merge from SRS2, for #834	2017-04-09 18:52:21 +08:00
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	2017-04-09 18:45:42 +08:00
winlin	8b7566a007	Refine code	2017-03-26 18:30:33 +08:00
winlin	e3526c0cf6	For #820, modules use service only.	2017-03-26 13:40:39 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	62b7204514	Refine code, add mp4 parser module	2017-03-25 15:40:28 +08:00
winlin	ad87bd7cf2	Refine configure	2017-03-01 09:21:20 +08:00
winlin	cdfded6a74	Support disable valgrind	2017-02-28 14:47:00 +08:00
winlin	89a5fa69d1	Refine srs-librtmp, set the schema, rather that connect app3	2017-02-28 14:07:14 +08:00
HungMingWu	a6582c6208	Disable openssl thread support to prevent ubuntu linking pthread error	2017-02-25 09:47:29 +00:00
HungMingWu	01d5e4da17	Replace openssl from l-1.0.1f to 1.10e (#774) ... DUe to API breakchange, add a wrapper for backward compatibility	2017-02-25 12:06:39 +08:00
HungMingWu	33d6274217	Replace ffmpeg version from 2.1.1 to 3.2.4	2017-02-13 23:29:39 +08:00
winlin	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	11e8fe5bc0	refine options, remove rtmp-hls	2017-02-11 12:45:49 +08:00
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
winlin	c5fcc15989	update the date info	2017-01-18 16:41:47 +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	10a0c6c10c	update for srs3	2017-01-06 17:55:06 +08:00
winlin	1b1ae00910	fix #727, install valgrind-devel	2017-01-06 17:51:07 +08:00
winlin	f9a159cd21	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	a8ee3162d4	Merge branch '2.0release' into develop	2016-03-03 15:30:38 +08:00
winlin	d72b93e58b	fix the sed bug, to compatible with osx	2016-03-03 10:57:26 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	2015-12-07 11:35:05 +08:00
winlin	44b26271bf	Merge branch '2.0release' into develop	2015-11-11 17:12:34 +08:00
winlin	c4c63f7825	fix build failed bug for osx.	2015-11-11 17:06:12 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	6df4d1f05a	merge from srs2.	2015-11-05 15:12:49 +08:00
winlin	98e25def6c	fix utest build failed for osx.	2015-11-05 15:11:59 +08:00
winlin	11979229e6	Merge branch '2.0release' into develop	2015-10-26 13:34:44 +08:00