Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release

Browse source

# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp

...

This commit is contained in:

Harlan 2018-08-15 07:37:12 +08:00

parent bf12a45274 a61bfb2066

commit 22c5af62cf

49 changed files with 4667 additions and 4248 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1243

trunk/src/kernel/srs_kernel_utility.cpp

View file

File diff suppressed because it is too large Load diff