external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-04-04 18:48:48 +08:00
commit bae7484d53
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -470,7 +470,7 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc)
{ {
// Refresh the relation for audio. // Refresh the relation for audio.
// TODO: FIMXE: Match by label? // TODO: FIMXE: Match by label?
if (desc->audio_track_desc_ && audio_tracks_.size() == 1) { if (desc && desc->audio_track_desc_ && audio_tracks_.size() == 1) {
uint32_t ssrc = desc->audio_track_desc_->ssrc_; uint32_t ssrc = desc->audio_track_desc_->ssrc_;
SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second; SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second;
@ -480,7 +480,7 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc)
// Refresh the relation for video. // Refresh the relation for video.
// TODO: FIMXE: Match by label? // TODO: FIMXE: Match by label?
if (desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) { if (desc && desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) {
SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0); SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0);
uint32_t ssrc = vdesc->ssrc_; uint32_t ssrc = vdesc->ssrc_;
SrsRtcVideoSendTrack* track = video_tracks_.begin()->second; SrsRtcVideoSendTrack* track = video_tracks_.begin()->second;

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

@ -26,6 +26,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 88 #define VERSION_REVISION 89
#endif #endif