external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature/rtc' into rtc

Browse source
This commit is contained in:
xiaozhihong 2020-04-01 14:39:05 +08:00
commit 4f671b1de2
50 changed files with 4898 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1,7 +1,7 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2013-2020 Winlin
* Copyright (c) 2013-2020 John
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in