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>		2021-06-30 07:24:12 +08:00
..
3rdparty	Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444)	2021-06-28 07:35:52 +08:00
auto	Fix #2431, configure FFmpeg bug. 4.0.135	2021-06-28 07:46:13 +08:00
conf	Squash for #2424, query the latest available version. 4.0.132	2021-06-27 08:56:41 +08:00
doc	SquashSRS3: Link source flv in doc	2021-04-30 17:04:57 +08:00
etc/init.d	Refine etc script to collect stderr logs	2020-10-27 18:00:18 +08:00
gdb	ST: Support show coroutines.	2020-12-10 11:36:24 +08:00
ide	Remove dead code: memory watch	2021-02-19 18:53:40 +08:00
modules	Revert "remove modules for srt compile"	2020-01-23 12:09:54 +08:00
research	Change GB28181 to feature/gb28181. 4.0.127	2021-06-16 08:27:37 +08:00
scripts	Refine scripts	2021-06-22 07:45:26 +08:00
src	打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448)	2021-06-30 07:24:12 +08:00
usr/lib/systemd/system	Support systemctl service for CentOS7. 3.0.58	2019-10-05 20:33:26 +08:00
.gitignore	Test: Add missing files for srs-bench	2021-03-10 07:03:57 +08:00
configure	Squash for #2424, query the latest available version. 4.0.132	2021-06-27 08:56:41 +08:00