mirror of
https://github.com/ossrs/srs.git
synced 2025-02-13 03:41:55 +00:00
Merge branch v5.0.108 into develop
* DASH: Fix dash crash bug when writing file. v5.0.108 (#3301) * Test: Refine cache for cygwin64 test.
This commit is contained in:
commit
72182865ef
4 changed files with 7 additions and 4 deletions
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
|
@ -55,8 +55,10 @@ jobs:
|
|||
shell: C:\cygwin64\bin\bash.exe --login '{0}'
|
||||
run: |
|
||||
WORKDIR=$(cygpath -u $SRS_WORKSPACE) && export PATH=/usr/bin:/usr/local/bin && cd ${WORKDIR} &&
|
||||
pwd && ls -lh && rm -rf trunk/objs && tar xf objs.tar.bz2 -C trunk/ && du -sh trunk/* && du -sh trunk/objs/* &&
|
||||
cd ${WORKDIR}/trunk && ./configure --gb28181=on --utest=on && make utest && ./objs/srs_utest
|
||||
pwd && rm -rf /usr/local/srs-cache && mkdir -p /usr/local/srs-cache/srs/trunk &&
|
||||
tar xf objs.tar.bz2 -C /usr/local/srs-cache/srs/trunk/ && du -sh /usr/local/srs-cache/srs/trunk/* &&
|
||||
cd ${WORKDIR}/trunk && ./configure --gb28181=on --utest=on && ls -lh && du -sh * && du -sh objs/* &&
|
||||
cd ${WORKDIR}/trunk && make utest && ./objs/srs_utest
|
||||
outputs:
|
||||
SRS_CYGWIN_DONE: ok
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ The changelog for SRS.
|
|||
|
||||
## SRS 5.0 Changelog
|
||||
|
||||
* v5.0, 2022-12-12, Merge [#3301](https://github.com/ossrs/srs/pull/3301): DASH: Fix dash crash bug when writing file. v5.0.108
|
||||
* v5.0, 2022-12-09, Merge [#3296](https://github.com/ossrs/srs/pull/3296): SRT: Support SRT to RTMP to WebRTC. v5.0.107
|
||||
* v5.0, 2022-12-08, Merge [#3295](https://github.com/ossrs/srs/pull/3295): API: Parse fragment of URI. v5.0.106
|
||||
* v5.0, 2022-12-04, Cygwin: Enable gb28181 for Windows. v5.0.105
|
||||
|
|
|
@ -458,7 +458,7 @@ void SrsDashController::on_unpublish()
|
|||
srs_freep(err);
|
||||
}
|
||||
|
||||
if (acurrent->duration() > 0) {
|
||||
if (acurrent && acurrent->duration() > 0) {
|
||||
afragments->append(acurrent);
|
||||
acurrent = NULL;
|
||||
}
|
||||
|
|
|
@ -9,6 +9,6 @@
|
|||
|
||||
#define VERSION_MAJOR 5
|
||||
#define VERSION_MINOR 0
|
||||
#define VERSION_REVISION 107
|
||||
#define VERSION_REVISION 108
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue