external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 11:21:52 +00:00
Code Issues Releases Wiki Activity

For #1672, fix dvr close file failed bug. 3.0.140

Browse source
This commit is contained in:
winlin 2020-03-30 10:44:11 +08:00
parent cd1513d6a3
commit 57604a9c65
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS.txt
View file

@ -53,3 +53,5 @@ CONTRIBUTORS ordered by first contribution.
* alphonsetai<tyh_123@163.com> * alphonsetai<tyh_123@163.com>
* Michael.Ma<wnpllr@gmail.com> * Michael.Ma<wnpllr@gmail.com>
* lam2003<linmin3@yy.com> * lam2003<linmin3@yy.com>
* l<22312935+lam2003@users.noreply.github.com>
* xfalcon<x-falcon@users.noreply.github.com>

1
README.md
View file

@ -149,6 +149,7 @@ For previous versions, please read:
## V3 changes ## V3 changes
* v3.0, 2020-03-30, For [#1672][bug #1672], fix dvr close file failed bug. 3.0.140
* <strong>v3.0, 2020-03-29, [3.0 beta4(3.0.139)][r3.0b4] released. 122674 lines.</strong> * <strong>v3.0, 2020-03-29, [3.0 beta4(3.0.139)][r3.0b4] released. 122674 lines.</strong>
* v3.0, 2020-03-28, Support multiple OS/Platform build cache. 3.0.139 * v3.0, 2020-03-28, Support multiple OS/Platform build cache. 3.0.139
* v3.0, 2020-03-28, For [#1250][bug #1250], support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138 * v3.0, 2020-03-28, For [#1250][bug #1250], support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138

1
trunk/scripts/new_authors.sh
View file

@ -11,7 +11,6 @@ for author in $authors; do
echo $author| grep 'winterserver' >/dev/null 2>&1 && continue; echo $author| grep 'winterserver' >/dev/null 2>&1 && continue;
echo $author| grep 'wenjie.zhao' >/dev/null 2>&1 && continue; echo $author| grep 'wenjie.zhao' >/dev/null 2>&1 && continue;
echo $author| grep 'zhaowenjie' >/dev/null 2>&1 && continue; echo $author| grep 'zhaowenjie' >/dev/null 2>&1 && continue;
echo $author| grep 'noreply' >/dev/null 2>&1 && continue;
grep $author $AFILE 1>/dev/null 2>/dev/null && continue; grep $author $AFILE 1>/dev/null 2>/dev/null && continue;

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

@ -179,13 +179,12 @@ srs_error_t SrsDvrSegmenter::close()
} }
// Close the encoder, then close the fs object. // Close the encoder, then close the fs object.
if ((err = close_encoder()) != srs_success) { err = close_encoder();
fs->close(); fs->close(); // Always close the file.
if (err != srs_success) {
return srs_error_wrap(err, "close encoder"); return srs_error_wrap(err, "close encoder");
} }
fs->close();
// when tmp flv file exists, reap it. // when tmp flv file exists, reap it.
if ((err = fragment->rename()) != srs_success) { if ((err = fragment->rename()) != srs_success) {
return srs_error_wrap(err, "rename fragment"); return srs_error_wrap(err, "rename fragment");

2
trunk/src/core/srs_core_version3.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION3_HPP #ifndef SRS_CORE_VERSION3_HPP
#define SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP
#define SRS_VERSION3_REVISION 139 #define SRS_VERSION3_REVISION 140
#endif #endif