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

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-05-08 11:32:51 +08:00
commit 92d95a500f
20 changed files with 405 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_hourglass.cpp
View file

@ -32,7 +32,7 @@ using namespace std;
#include <srs_protocol_kbps.hpp>
SrsPps* _srs_pps_timer = new SrsPps();
SrsPps* _srs_pps_timer = NULL;
extern SrsPps* _srs_pps_clock_15ms;
extern SrsPps* _srs_pps_clock_20ms;