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 from 2.0

Browse source
This commit is contained in:
winlin 2016-11-09 09:44:19 +08:00
commit 0a8d40925f
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_source.cpp Normal file → Executable file
View file

@ -1044,7 +1044,7 @@ bool SrsSource::expired()
}
// still publishing?
if (!_can_publish) {
if (!_can_publish || !publish_edge->can_publish()) {
return false;
}

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 220
#define VERSION_REVISION 221
// generated by configure, only macros.
#include <srs_auto_headers.hpp>