Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable. v5.0.169 v6.0.62 #3699

Merged
merged 7 commits into from
Jul 26, 2023
Merged

Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable. v5.0.169 v6.0.62 #3699

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
44d4d8f
Bugfix: repeate define _srs_rtc_manager
feixintianxia Jul 21, 2023
0cf0456
Bugfix: remove duplicated variable definitions
feixintianxia Jul 25, 2023
bf5859c
Switch stable version to SRS 5.0
winlinvip Jul 24, 2023
7a50369
Refine CHANGELOG format.
winlinvip Jul 26, 2023
7fc479b
Fix #3715: Support disable sanitizer.
winlinvip Jul 26, 2023
f6f20df
Merge branch 'develop' into pr-bugfix/repeate_define_variables
winlinvip Jul 26, 2023
05caf0c
Update release to v5.0.169 v6.0.62
winlinvip Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions trunk/src/app/srs_app_threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,11 @@ extern SrsStageManager* _srs_stages;
extern SrsRtcBlackhole* _srs_blackhole;
extern SrsResourceManager* _srs_rtc_manager;

extern SrsResourceManager* _srs_rtc_manager;
extern SrsDtlsCertificate* _srs_rtc_dtls_certificate;
#endif

#include <srs_protocol_kbps.hpp>

extern SrsPps* _srs_pps_snack2;
Copy link
Member

@winlinvip winlinvip Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test

TRANS_BY_GPT3

Copy link
Member

@winlinvip winlinvip Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test translation

TRANS_BY_GPT3

Copy link
Member

@winlinvip winlinvip Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Translation test

TRANS_BY_GPT3

extern SrsPps* _srs_pps_snack3;
extern SrsPps* _srs_pps_snack4;
Copy link
Member

@winlinvip winlinvip Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test individual Review

TRANS_BY_GPT3


SrsPps* _srs_pps_aloss2 = NULL;

extern SrsPps* _srs_pps_ids;
Expand Down