5923 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
kyxlx550	f287525f85	Merge branch 'dev-28181' of https://gitee.com/kyxlx550/srs into dev-28181	2020-07-02 09:06:31 +08:00
kyxlx550	65a23418ed	notes w_ps_file define	2020-07-02 09:06:05 +08:00
kyxlx550	1bbf5c8126	fix ps to h264 frame_size < 0 checkt	2020-07-02 09:06:05 +08:00
kyxlx550	83c2586d79	support audio g711	2020-07-02 09:06:05 +08:00
kyxlx550	6bf1eee2bc	fix ps buffer dynamic increase according to stream size	2020-07-02 09:06:05 +08:00
kyxlx550	e506191484	fix rtmp muxer cycle sleep	2020-07-02 09:06:05 +08:00
kyxlx550	ce919a2cbb	notes w_ps_file define	2020-07-02 01:35:20 +08:00
kyxlx550	18abfd3063	fix ps to h264 frame_size < 0 checkt	2020-07-02 01:32:32 +08:00
kyxlx550	b574c43676	support audio g711	2020-06-30 23:11:20 +08:00
winlin	f514dd78c1	Merge branch '4.0release' into develop	2020-06-28 10:28:39 +08:00
winlin	78e28dcfde	Merge branch '3.0release' into 4.0release	2020-06-28 10:28:14 +08:00
kyxlx550	7419bf4cf4	fix ps buffer dynamic increase according to stream size	2020-06-27 19:38:24 +08:00
winlin	e3f1aee6c1	Release 3.0 r0, 3.0.141	2020-06-27 11:47:36 +08:00
winlin	c8892c4009	Fix build failed for no ffmpeg-fit	2020-06-24 13:52:36 +08:00
winlin	7c572dbae3	Merge branch 'feature/rtc' into develop	2020-06-24 13:46:12 +08:00
winlin	6314c273ff	Support static link c++ libraries. 4.0.32	2020-06-24 13:36:18 +08:00
winlin	be5d76009e	RTC: Support build without RTMP2RTC bridger, no FFmpeg fit.	2020-06-24 12:44:13 +08:00
winlin	677a006709	Update README	2020-06-24 11:45:07 +08:00
winlin	a18cda91b3	Merge branch '4.0release' into develop	2020-06-24 11:40:07 +08:00
winlin	14afe78662	Merge branch '3.0release' into 4.0release	2020-06-24 11:39:17 +08:00
winlin	024df5bdbf	Refine README	2020-06-24 11:38:48 +08:00
winlin	5d286776a5	Fix README link	2020-06-24 11:37:25 +08:00
winlin	1c72a89fca	Merge branch 'feature/rtc' into develop	2020-06-23 18:58:37 +08:00
winlin	ab6bc39676	Change log cid from int to string. 4.0.31	2020-06-23 18:35:59 +08:00
winlin	acb8793140	RTC: Change reuseport to 1	2020-06-23 18:31:27 +08:00
winlin	89c0748234	Fix the empty cid issue	2020-06-23 17:39:16 +08:00
kyxlx550	868aaaed9e	fix rtmp muxer cycle sleep	2020-06-21 21:12:11 +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	0aea46ac8b	Merge remote-tracking branch 'lixin/dev-28181' into feature/gb28181	2020-06-19 13:30:13 +08:00
winlin	7627c290c9	Fix context string ID bug	2020-06-19 08:57:18 +08:00
kyxlx550	d01955443e	remove sip device list locker, add sip session locker	2020-06-19 00:46:59 +08:00
jinxue.cgh	83ce78a015	tfsfu: fix compile error for bind, and warning	2020-06-18 11:48:10 +08:00
winlin	8a0c2e01f8	Log: Change cid from int to string	2020-06-18 11:45:43 +08:00
winlin	bca4ec1da1	RTC: Support set the sequence in query string	2020-06-17 15:18:14 +08:00
winlin	cfa74a0715	UDP: Refine context id	2020-06-16 19:45:55 +08:00
winlin	ab4dfbf755	RTC: Fix log typo	2020-06-16 16:50:33 +08:00
winlin	c30565b4c0	RTC: Support keep original seq	2020-06-16 16:41:04 +08:00
winlin	29661802b6	RTC: If NACK disabled, print a log.	2020-06-16 16:17:33 +08:00
winlin	cf738754ae	RTC: Generate timestamp only when transcode opus to aac.	2020-06-16 13:39:02 +08:00
winlin	2c1bd6da3e	Merge SRS	2020-06-14 12:35:03 +08:00
winlin	e75f28a327	GB28181 with JitterBuffer support. 4.0.29	2020-06-13 13:17:23 +08:00
winlin	1343d4f605	RTC: Disable c++14	2020-06-11 18:16:48 +08:00
莫战	db8d91cbee	add c++14 support	2020-06-11 18:15:45 +08:00
winlin	31ff84c82d	Ignore some files	2020-06-09 17:18:31 +08:00
winlin	b694550456	Support c++ .h and .cc	2020-06-09 17:17:36 +08:00
kyxlx550	84afc32a96	fix sip catalog status list check error	2020-06-09 10:08:41 +08:00
kyxlx550	ed82d60aac	fix while sleep time	2020-06-08 18:27:03 +08:00
kyxlx550	813c83ccc7	fix no maker one frame check	2020-06-08 18:26:08 +08:00
kyxlx550	2172209321	ps to rtmp via source, h264 start code with replace nalulen	2020-06-07 21:51:06 +08:00