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 branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-11-04 07:36:24 +08:00
commit 60d474b1da
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -916,6 +916,8 @@ srs_error_t SrsPlayEdge::on_client_play()
if (state == SrsEdgeStateInit) {
state = SrsEdgeStatePlay;
err = ingester->start();
} else if (state == SrsEdgeStateIngestStopping) {
return srs_error_new(ERROR_RTMP_EDGE_PLAY_STATE, "state is stopping");
}
return err;