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 '3.0release' of https://github.com/ossrs/srs into 3.0release

Browse source 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
This commit is contained in:
Harlan 2018-08-15 07:37:12 +08:00
commit 22c5af62cf
49 changed files with 4667 additions and 4248 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,8 +182,11 @@ SrsTsMessage* SrsTsMessage::detach()
cp->sid = sid;
cp->PES_packet_length = PES_packet_length;
cp->continuity_counter = continuity_counter;
srs_freep(cp->payload);
cp->payload = payload;
payload = NULL;
return cp;
}