mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge from SRS3
This commit is contained in:
commit
61c7443c4b
12 changed files with 53 additions and 45 deletions
|
@ -179,12 +179,12 @@ srs_error_t SrsDvrSegmenter::close()
|
|||
}
|
||||
|
||||
// Close the encoder, then close the fs object.
|
||||
if ((err = close_encoder()) != srs_success) {
|
||||
err = close_encoder();
|
||||
fs->close(); // Always close the file.
|
||||
if (err != srs_success) {
|
||||
return srs_error_wrap(err, "close encoder");
|
||||
}
|
||||
|
||||
fs->close();
|
||||
|
||||
// when tmp flv file exists, reap it.
|
||||
if ((err = fragment->rename()) != srs_success) {
|
||||
return srs_error_wrap(err, "rename fragment");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue