diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 5ce479c00..3b122e650 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v5.0, 2022-12-26, For [#465](https://github.com/ossrs/srs/issues/465): TS: Fix bug for codec detecting for HTTP-TS. v6.0.8 * v5.0, 2022-12-25, For [#296](https://github.com/ossrs/srs/issues/296): Fix [#3338](https://github.com/ossrs/srs/issues/3338): MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 * 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 diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 6f376d3bc..c28577e78 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 7 +#define VERSION_REVISION 8 #endif diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 5e2faeb7b..2d7145b1a 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -3271,9 +3271,9 @@ srs_error_t SrsTsTransmuxer::write_video(int64_t timestamp, char* data, int size return err; } - bool codec_ok = (format->vcodec->id != SrsVideoCodecIdAVC); + bool codec_ok = (format->vcodec->id == SrsVideoCodecIdAVC); #ifdef SRS_H265 - codec_ok = codec_ok ? true : (format->vcodec->id != SrsVideoCodecIdHEVC); + codec_ok = codec_ok ? true : (format->vcodec->id == SrsVideoCodecIdHEVC); #endif if (!codec_ok) { return err;