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

fix #713, disable the source cleanup. 2.0.223

Browse source
This commit is contained in:
winlin 2016-12-13 18:41:45 +08:00
parent cb1d47bfef
commit aca8a79d95
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -344,6 +344,7 @@ Remark:
## History ## History
* v2.0, 2016-12-13, fix #713, disable the source cleanup. 2.0.223
* v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222 * v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222
* <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong>
* v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221 * v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221

10
trunk/src/app/srs_app_source.cpp
View file

@ -792,9 +792,17 @@ void SrsSource::dispose_all()
int SrsSource::cycle_all() int SrsSource::cycle_all()
{ {
int ret = ERROR_SUCCESS;
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/713
// @see https://github.com/ossrs/srs/issues/714
#if 0
int cid = _srs_context->get_id(); int cid = _srs_context->get_id();
int ret = do_cycle_all(); ret = do_cycle_all();
_srs_context->set_id(cid); _srs_context->set_id(cid);
#endif
return ret; return ret;
} }

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 // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 221 #define VERSION_REVISION 223
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>