You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

winlin 5d48c9ce1b Refine code to allow search for conflicts.		2 years ago
..
3rdparty	FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)	2 years ago
auto	Merge branch v5.0.105 into develop.	2 years ago
conf	Merge branch v5.0.116 into develop	2 years ago
doc	MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 (#296) (#3338)	2 years ago
etc/init.d	Squash: Fix bugs	3 years ago
gdb	ST: Support show coroutines.	4 years ago
ide/srs_clion	Merge branch v5.0.103 into develop	2 years ago
modules	Moduels: Refine the description	4 years ago
packaging	Windows: Refine cygwin pipeline (#3260)	2 years ago
research	MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 (#296) (#3338)	2 years ago
scripts	Package script support extra options. v5.0.102	2 years ago
src	Refine code to allow search for conflicts.	2 years ago
usr/lib/systemd/system	Squash: Support RPM. Fix bugs.	3 years ago
.gitignore	For #2136: API: Cleanup no active streams for statistics. v5.0.42	3 years ago
AUTHORS.md	Merge 4.0release, update AUTHORS	3 years ago
AUTHORS.txt	Update AUTHORS	4 years ago
Dockerfile	MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333)	2 years ago
Dockerfile.builds	Merge branch v5.0.103 into develop	2 years ago
Dockerfile.cov	Merge branch v5.0.103 into develop	2 years ago
Dockerfile.pkg	Merge branch v5.0.103 into develop	2 years ago
Dockerfile.test	Merge branch v5.0.103 into develop	2 years ago
configure	Merge branch v5.0.103 into develop	2 years ago