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 2.0release

Browse source
This commit is contained in:
winlin 2018-07-21 17:52:12 +08:00
commit 608c88b8f2
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -220,6 +220,7 @@ Please select according to languages:
### V2 changes ### V2 changes
* v2.0, 2018-07-21, Merge [#1119][bug #1119], fix memory leak. 2.0.249
* <strong>v2.0, 2018-07-18, [2.0 release3(2.0.248)][r2.0r3] released. 86775 lines.</strong> * <strong>v2.0, 2018-07-18, [2.0 release3(2.0.248)][r2.0r3] released. 86775 lines.</strong>
* v2.0, 2018-07-17, Merge [#1176][bug #1176], fix scaned issues. 2.0.248 * v2.0, 2018-07-17, Merge [#1176][bug #1176], fix scaned issues. 2.0.248
* v2.0, 2018-02-28, Merge [#1077][bug #1077], fix crash for edge HLS. 2.0.247 * v2.0, 2018-02-28, Merge [#1077][bug #1077], fix crash for edge HLS. 2.0.247
@ -1424,6 +1425,7 @@ Winlin
[bug #1059]: https://github.com/ossrs/srs/issues/1059 [bug #1059]: https://github.com/ossrs/srs/issues/1059
[bug #1077]: https://github.com/ossrs/srs/issues/1077 [bug #1077]: https://github.com/ossrs/srs/issues/1077
[bug #1176]: https://github.com/ossrs/srs/issues/1176 [bug #1176]: https://github.com/ossrs/srs/issues/1176
[bug #1119]: https://github.com/ossrs/srs/issues/1119
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[bug #735]: https://github.com/ossrs/srs/issues/735 [bug #735]: https://github.com/ossrs/srs/issues/735

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

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

5
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -906,10 +906,12 @@ int SrsIngestHlsOutput::parse_message_queue()
std::multimap<int64_t, SrsTsMessage*>::iterator it = queue.begin(); std::multimap<int64_t, SrsTsMessage*>::iterator it = queue.begin();
SrsTsMessage* msg = it->second; SrsTsMessage* msg = it->second;
SrsAutoFree(SrsTsMessage, msg);
queue.erase(it);
if (msg->channel->stream == SrsTsStreamVideoH264) { if (msg->channel->stream == SrsTsStreamVideoH264) {
nb_videos--; nb_videos--;
} }
queue.erase(it);
// parse the stream. // parse the stream.
SrsBuffer avs(msg->payload->bytes(), msg->payload->length()); SrsBuffer avs(msg->payload->bytes(), msg->payload->length());
@ -939,6 +941,7 @@ int SrsIngestHlsOutput::flush_message_queue()
std::multimap<int64_t, SrsTsMessage*>::iterator it = queue.begin(); std::multimap<int64_t, SrsTsMessage*>::iterator it = queue.begin();
SrsTsMessage* msg = it->second; SrsTsMessage* msg = it->second;
SrsAutoFree(SrsTsMessage, msg);
queue.erase(it); queue.erase(it);
// parse the stream. // parse the stream.