external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-06-28 07:30:24 +08:00
commit 6fa9f33f27
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_hls.cpp
View file

@ -923,10 +923,6 @@ srs_error_t SrsHlsController::on_unpublish()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if ((err = muxer->on_unpublish()) != srs_success) {
return srs_error_wrap(err, "muxer unpublish");
}
if ((err = muxer->flush_audio(tsmc)) != srs_success) { if ((err = muxer->flush_audio(tsmc)) != srs_success) {
return srs_error_wrap(err, "hls: flush audio"); return srs_error_wrap(err, "hls: flush audio");
} }
@ -934,6 +930,10 @@ srs_error_t SrsHlsController::on_unpublish()
if ((err = muxer->segment_close()) != srs_success) { if ((err = muxer->segment_close()) != srs_success) {
return srs_error_wrap(err, "hls: segment close"); return srs_error_wrap(err, "hls: segment close");
} }
if ((err = muxer->on_unpublish()) != srs_success) {
return srs_error_wrap(err, "muxer unpublish");
}
return err; return err;
} }