external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

TS: Fix bug for codec detecting for HTTP-TS. v6.0.8 (#465)

Browse source
This commit is contained in:
winlin 2022-12-26 18:30:12 +08:00
parent a6c926f985
commit 4b6f1b0fd6
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 6.0 Changelog ## 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 * 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-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-12-04, Merge [#3271](https://github.com/ossrs/srs/pull/3271): H265: The codec information is incorrect. v6.0.5

2
trunk/src/core/srs_core_version6.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 6 #define VERSION_MAJOR 6
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 7 #define VERSION_REVISION 8
#endif #endif

4
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -3271,9 +3271,9 @@ srs_error_t SrsTsTransmuxer::write_video(int64_t timestamp, char* data, int size
return err; return err;
} }
bool codec_ok = (format->vcodec->id != SrsVideoCodecIdAVC); bool codec_ok = (format->vcodec->id == SrsVideoCodecIdAVC);
#ifdef SRS_H265 #ifdef SRS_H265
codec_ok = codec_ok ? true : (format->vcodec->id != SrsVideoCodecIdHEVC); codec_ok = codec_ok ? true : (format->vcodec->id == SrsVideoCodecIdHEVC);
#endif #endif
if (!codec_ok) { if (!codec_ok) {
return err; return err;