diff --git a/trunk/3rdparty/patches/srt/api.cpp-01.patch b/trunk/3rdparty/patches/srt/api.cpp-01.patch new file mode 100644 index 000000000..e1ca77928 --- /dev/null +++ b/trunk/3rdparty/patches/srt/api.cpp-01.patch @@ -0,0 +1,4 @@ +1116c1116 +< LOGC(cnlog.Debug, log << "srt_accept: no pending connection available at the moment"); +--- +> LOGC(cnlog.Error, log << "srt_accept: no pending connection available at the moment"); diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 975b99a05..a04883a46 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -677,6 +677,7 @@ if [[ $SRS_SRT == YES ]]; then echo "Build srt-1-fit" && rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/srt-1-fit ${SRS_OBJS}/${SRS_PLATFORM}/3rdparty/srt ${SRS_OBJS}/srt && cp -rf ${SRS_WORKDIR}/3rdparty/srt-1-fit ${SRS_OBJS}/${SRS_PLATFORM}/ && + patch -p0 -R ${SRS_OBJS}/${SRS_PLATFORM}/srt-1-fit/srtcore/api.cpp ${SRS_WORKDIR}/3rdparty/patches/srt/api.cpp-01.patch && ( cd ${SRS_OBJS}/${SRS_PLATFORM}/srt-1-fit && env PKG_CONFIG_PATH=${SRS_DEPENDS_LIBS}/openssl/lib/pkgconfig \ diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 5112d7b54..2f5ff5391 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-09-21, Merge [#3696](https://github.com/ossrs/srs/pull/3696): SRT: modify log level from error to debug when no socket to accept. v5.0.180 (#3696) * v5.0, 2023-09-18, Merge [#3804](https://github.com/ossrs/srs/pull/3804): Support FFmpeg timecode, fix AMF0 parsing failed. v5.0.179 (#3804) * v5.0, 2023-09-08, Merge [#3597](https://github.com/ossrs/srs/pull/3597): Fix RBSP stream parsing bug, should drop 0x03. v5.0.178 (#3597) * v5.0, 2023-09-07, Merge [#3795](https://github.com/ossrs/srs/pull/3795): Fix dash crash if format not supported. v5.0.177 (#3795) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index f37c0df66..dc1377100 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 179 +#define VERSION_REVISION 180 #endif