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

rename org simle-rtmp-server to ossrs

Browse source
This commit is contained in:
winlin 2015-11-11 10:45:45 +08:00
commit 01c46bdbfd
252 changed files with 985 additions and 985 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_dvr.cpp
View file

@ -1,7 +1,7 @@
/*
The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
Copyright (c) 2013-2015 SRS(ossrs)
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
@ -519,7 +519,7 @@ int SrsDvrAsyncCallOnDvr::call()
// the http hooks will cause context switch,
// so we must copy all hooks for the on_connect may freed.
// @see https://github.com/simple-rtmp-server/srs/issues/475
// @see https://github.com/ossrs/srs/issues/475
vector<string> hooks;
if (true) {
@ -928,7 +928,7 @@ int SrsDvrSegmentPlan::update_duration(SrsSharedPtrMessage* msg)
}
// when wait keyframe, ignore if no frame arrived.
// @see https://github.com/simple-rtmp-server/srs/issues/177
// @see https://github.com/ossrs/srs/issues/177
if (_srs_config->get_dvr_wait_keyframe(req->vhost)) {
if (!msg->is_video()) {
return ret;