259 commits

Author	SHA1	Message	Date
winlin	a51e275414	Merge SRS3	2020-10-23 21:35:13 +08:00
winlin	6dc3d85ded	Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147	2020-10-23 21:32:57 +08:00
winlin	1d92ff73fb	Fix build script	2020-10-23 21:24:29 +08:00
winlin	be1a1d99de	Merge SRS3	2020-10-23 21:22:58 +08:00
winlin	e1ff69f292	Refine build script, use libssl in docker. 3.0.146	2020-10-23 21:14:40 +08:00
winlin	dd13889772	BUILD: Compatible with 3.0 options, ignore it	2020-08-03 19:33:34 +08:00
winlin	7c572dbae3	Merge branch 'feature/rtc' into develop	2020-06-24 13:46:12 +08:00
winlin	be5d76009e	RTC: Support build without RTMP2RTC bridger, no FFmpeg fit.	2020-06-24 12:44:13 +08:00
winlin	a822c841cb	Merge branch '3.0release' into develop	2020-06-20 21:48:24 +08:00
winlin	ac69889b3a	Link FFmpeg if exists	2020-06-20 21:48:04 +08:00
winlin	a78b6b8cda	RTC: Remove --research	2020-05-29 17:02:10 +08:00
winlin	d43d9674a3	RTC: Remove --librtmp	2020-05-29 17:00:06 +08:00
winlin	a3388bf624	RTC: Remove export srs-librtmp support	2020-05-27 14:20:40 +08:00
winlin	3a58d9859c	RTC: Extract rtc server in app	2020-05-11 11:45:20 +08:00
winlin	2a0562da5e	Refine RTC, disable NASM, SENDMMSG, SRTP-NASM	2020-05-03 11:14:11 +08:00
winlin	5eba90ded9	Refine build script	2020-04-29 19:07:25 +08:00
winlin	0b62ca02b7	Merge develop	2020-04-27 14:01:33 +08:00
winlin	ded37c6719	Refine build script	2020-04-27 13:59:57 +08:00
winlin	028ef56772	Fix sendmmsg build failed bug	2020-04-26 22:41:03 +08:00
winlin	613baa561a	Update script	2020-04-24 09:42:15 +08:00
winlin	f2b575e841	Merge branch 'feature/rtc' into develop	2020-04-21 14:04:27 +08:00
winlin	20896325ea	Update script	2020-04-21 14:02:26 +08:00
winlin	72322836c6	Update demo for zerocopy	2020-04-20 20:25:23 +08:00
winlin	c96ffd272c	Cache RTP packet vector	2020-04-15 21:59:27 +08:00
winlin	095e7c5a4e	Fix build script	2020-04-15 10:36:39 +08:00
winlin	6e9e0d6ce3	Fix build script	2020-04-15 10:35:38 +08:00
winlin	b1438bf52c	Merge branch 'develop' into feature/rtc	2020-04-13 19:51:35 +08:00
winlin	f072f30854	Merge branch '4.0release' into develop	2020-04-13 19:51:13 +08:00
winlin	bfe40f0115	Check pkg-config	2020-04-13 19:50:40 +08:00
winlin	40eb5c0ef5	For #307, disable vappi for FFmpeg-fit	2020-04-10 08:55:04 +08:00
winlin	bb0ca05390	Merge branch 'develop' into feature/rtc	2020-04-06 21:38:05 +08:00
winlin	9c1dfb79d3	Fix gperf build bug	2020-04-06 21:37:37 +08:00
winlin	dc3df926eb	For #307, support configure with sendmmsg.	2020-04-05 18:34:57 +08:00
winlin	10d5f99d3d	For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22	2020-04-05 17:14:22 +08:00
winlin	3793404ceb	Refine scripts	2020-04-04 20:24:24 +08:00
winlin	c5c0df6536	Update build script	2020-04-04 15:44:56 +08:00
winlin	5144794044	Detect older docker and disable SRTP ASM	2020-04-04 14:50:36 +08:00
winlin	f504cb2724	Refine build script	2020-04-03 22:46:04 +08:00
winlin	366d800720	For #307, use files of openssl 1.0.*	2020-04-03 21:59:32 +08:00
winlin	5e06a2568b	For #370, support SRTP with ASM(enable openssl) by default	2020-04-03 14:37:48 +08:00
winlin	bd05f69d0b	Refine openssl build script on OSX	2020-04-03 13:42:24 +08:00
winlin	15384e61e2	Remove duplicated build for srtp2	2020-04-02 12:33:58 +08:00
winlin	f9f9cfda9b	Refine cherrypy install script	2020-03-30 18:25:22 +08:00
winlin	60d810693c	Refine rebuild components	2020-03-29 21:30:32 +08:00
winlin	056fcd2928	Refine clean script	2020-03-29 19:06:51 +08:00
winlin	40cc8ed47c	Refine file path for st and ffmpeg	2020-03-29 18:44:01 +08:00
winlin	6935bb18ae	Merge branch '4.0release' into develop	2020-03-29 17:36:33 +08:00
winlin	6b8f0d84a3	Merge branch '3.0release' into 4.0release	2020-03-29 17:31:41 +08:00
winlin	80f315f1ae	Support utest on mac osx	2020-03-29 17:29:09 +08:00
winlin	22fbae139c	Refine links use relative path	2020-03-29 17:15:29 +08:00