From 2daf637aaad82e1b2216169aef4d8bda1fe7eecd Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 18 Dec 2022 11:48:09 +0800 Subject: [PATCH] Merge 5.0: FLV header and SRT bugfix. v6.0.6 1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323) 2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315) 3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311) 4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306) 5. FLV: Reset has_audio or has_video if only sequence header. (#3310) --- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version6.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 9f4f8347c..5414d6d65 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2022-12-17, Merge 5.0: FLV header and SRT bugfix. v6.0.6 * v6.0, 2022-12-04, Merge [#3271](https://github.com/ossrs/srs/pull/3271): H265: The codec information is incorrect. v6.0.5 * v6.0, 2022-11-23, Merge [#3275](https://github.com/ossrs/srs/pull/3275): H265: Support HEVC over HTTP-TS. v6.0.4 * v6.0, 2022-11-23, Merge [#3274](https://github.com/ossrs/srs/pull/3274): H265: Support parse multiple NALUs in a frame. v6.0.3 diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index f070ac5c4..fa8989d09 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 5 +#define VERSION_REVISION 6 #endif