diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 653c053a3..98747acfb 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2024-07-24, Merge [#4029](https://github.com/ossrs/srs/pull/4029): Player: Fix empty img tag occupy 20px size in safari. v6.0.142 (#4029) * v6.0, 2024-07-24, Merge [#4063](https://github.com/ossrs/srs/pull/4063): let http-remux ts stream support guess_has_av feature;. v6.0.141 (#4063) * v6.0, 2024-07-24, Merge [#4116](https://github.com/ossrs/srs/pull/4116): Dockerfile: Consistently use proper ENV syntax using "=". v6.0.140 (#4116) * v6.0, 2024-07-24, Merge [#4126](https://github.com/ossrs/srs/pull/4126): Edge: Improve stability for state and fd closing. v6.0.139 (#4126) diff --git a/trunk/research/console/en_index.html b/trunk/research/console/en_index.html index 45c6a43b4..fd45b31d3 100644 --- a/trunk/research/console/en_index.html +++ b/trunk/research/console/en_index.html @@ -20,7 +20,7 @@ - +
diff --git a/trunk/research/console/ng_index.html b/trunk/research/console/ng_index.html index 52143f744..cada0d40e 100644 --- a/trunk/research/console/ng_index.html +++ b/trunk/research/console/ng_index.html @@ -20,7 +20,7 @@ - +
diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index 5c02e3c59..e5a00308a 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -16,7 +16,7 @@ - +
diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 656595492..97e308b69 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -16,7 +16,7 @@ - +
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index 45882649e..b3e1498d2 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -15,7 +15,7 @@ - +
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index 089e60249..553a38b9d 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -14,7 +14,7 @@ - +
diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html index 5760d6ad0..d44235cc5 100644 --- a/trunk/research/players/srs_gb28181.html +++ b/trunk/research/players/srs_gb28181.html @@ -28,7 +28,7 @@ - +
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index fd4e9bdb6..ab5d71d80 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -11,7 +11,7 @@ - +
diff --git a/trunk/research/players/srs_player_deprecated.html b/trunk/research/players/srs_player_deprecated.html index 4979577de..ca6c89efc 100755 --- a/trunk/research/players/srs_player_deprecated.html +++ b/trunk/research/players/srs_player_deprecated.html @@ -25,7 +25,7 @@ - +
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index e45a34eb2..8ebc8c5a1 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -14,7 +14,7 @@ - +
diff --git a/trunk/research/players/srs_publisher_flash.html b/trunk/research/players/srs_publisher_flash.html index 4ad017cfc..8b311c994 100644 --- a/trunk/research/players/srs_publisher_flash.html +++ b/trunk/research/players/srs_publisher_flash.html @@ -11,7 +11,7 @@ - +
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index 1a90575ef..077d8e2fe 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -11,7 +11,7 @@ - +
diff --git a/trunk/research/players/whep.html b/trunk/research/players/whep.html index 28137917c..a1939e86a 100644 --- a/trunk/research/players/whep.html +++ b/trunk/research/players/whep.html @@ -16,7 +16,7 @@ - +
diff --git a/trunk/research/players/whip.html b/trunk/research/players/whip.html index 0b4de0a9c..60067fe7b 100644 --- a/trunk/research/players/whip.html +++ b/trunk/research/players/whip.html @@ -16,7 +16,7 @@ - +
diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index d6c8534e9..a8b538739 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 141 +#define VERSION_REVISION 142 #endif