7561 Commits (7f6185b127e5a3c1190e05bed9e7ea6595d2c359)

 

All Branches   

Search

Author	SHA1	Message	Date
winlin	75530efbc4	Squash: Merge #2448, #2440	4 years ago
winlin	2bd0deac47	Merge branch '4.0release' into merge/develop	4 years ago
winlin	7ad022c540	Merge branch 'develop' into merge/develop	4 years ago
winlin	ef43532cf4	Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137	4 years ago
Alex.CR	7e164b0061	SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) ... * solve srt push bugs * solve h264 mutiple nalus in srt when obs is configured in zerolatency * optimize error code * optimize error code * optimize error code * add commemnt:we only skip pps/sps frame and send left nalus in srt * add commemnt:we only skip pps/sps frame and send left nalus in srt Co-authored-by: shiwei <shiwei05@kuaishou.com>	4 years ago
long	cff4c07be4	打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448) ... * Update srs_app_rtmp_conn.cpp 修复推重复的RTMP流导致的RTC和RTMP播放的问题 * change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY Co-authored-by: Haibo Chen <495810242@qq.com>	4 years ago
Alex.CR	346cc96d7a	SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) ... * solve srt push bugs * solve h264 mutiple nalus in srt when obs is configured in zerolatency * optimize error code * optimize error code * optimize error code * add commemnt:we only skip pps/sps frame and send left nalus in srt * add commemnt:we only skip pps/sps frame and send left nalus in srt Co-authored-by: shiwei <shiwei05@kuaishou.com>	4 years ago
winlin	cbca6d94d1	Add API path document	4 years ago
winlin	98e56f5325	Refine the random id by srs_random_str	4 years ago
winlin	0391e71682	Squash: Merge SRS4	4 years ago
winlin	d166354498	Merge branch '4.0release' into merge/develop	4 years ago
winlin	a64827c0dd	Merge branch 'develop' into merge/develop	4 years ago
winlin	6ea270adf3	Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136	4 years ago
Xiaoniu	31679c46d4	check 'vhost' validity in 'http raw dvr api' (#2435)	4 years ago
Xiaoniu	f986b5956b	check 'vhost' validity in 'http raw dvr api' (#2435)	4 years ago
winlin	d02ba80db1	Squash: Fix bug for building FFmpeg	4 years ago
winlin	13ccf50773	Merge branch '4.0release' into merge/develop	4 years ago
winlin	ae27bef823	Merge branch 'develop' into merge/develop	4 years ago
winlin	bfae75077e	Fix #2431, configure FFmpeg bug. 4.0.135	4 years ago
winlin	c8d8581d4b	For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134	4 years ago
Hung-Yi Chen	bbd9d864d5	Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444)	4 years ago
winlin	5ee20613ca	Squash: Support query lastest available version. 5.0.6	4 years ago
winlin	6dc9ac311a	Merge	4 years ago
winlin	6fa9f33f27	Merge branch 'develop' into merge/develop	4 years ago
Xiaoniu	7bf03ef2ba	Fix #2068, losing of last HLS ts file 4.0.133 ... fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438)	4 years ago
Xiaoniu	d987e194ff	fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438)	4 years ago
winlin	aa12251084	Fix bug for v3.0-r6	4 years ago
winlin	da763e43d5	Squash for #2424, query the latest available version. 4.0.132	4 years ago
winlin	332732c48c	Merge #2429 to fix SRT bug. 4.0.131	4 years ago
winlin	ce47d5cc28	Squash: Update README	4 years ago
winlin	32bb99988e	Merge	4 years ago
winlin	f2fd184578	Merge branch '4.0release' into merge/develop	4 years ago
winlin	6ec1a383fa	Merge #2419 to fix SRT bug. 4.0.131	4 years ago
winlin	25262dd3cb	Fix SRT bug. 4.0.131	4 years ago
Alex.CR	bb9aefd869	srt publish core dump bug (#2429) ... * solve srt push bugs Co-authored-by: shiwei <shiwei05@kuaishou.com>	4 years ago
Alex.CR	67ac720b92	srt publish core dump bug (#2429) ... * solve srt push bugs Co-authored-by: shiwei <shiwei05@kuaishou.com>	4 years ago
winlin	a594678e3d	Squash #1685, #1282, #1547: Support ARM platform. 5.0.5	4 years ago
winlin	c183125af9	Merge branch '4.0release' into merge/develop	4 years ago
winlin	fed57f6f17	Refine scripts	4 years ago
winlin	27cac7f68e	Merge	4 years ago
winlin	5906345a97	Fix #2413, fix RTMP to RTC bug 4.0.130	4 years ago
john	1347da81f8	Check audio/video track when rtc stream updated (#2418)	4 years ago
winlin	3aba2f3479	Add machine to build dir	4 years ago
winlin	2376c4cebb	Add BBS link	4 years ago
winlin	fcb2b3da2c	Update README	4 years ago
winlin	bc35a1fc4c	Update README	4 years ago
winlin	1f0b5f0495	Update README	4 years ago
winlin	1254f5b1d4	Update README	4 years ago
winlin	52fb6aed10	Merge	4 years ago
winlin	92327b6e20	Merge branch 'develop' into merge/develop	4 years ago