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 '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-06-13 17:23:53 +08:00
commit c58b7231e2
3 changed files with 31 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_hls.cpp
View file

@ -1164,14 +1164,6 @@ void SrsHls::dispose()
on_unpublish();
}
// only dispose hls when positive.
if (_req) {
int hls_dispose = _srs_config->get_hls_dispose(_req->vhost);
if (hls_dispose <= 0) {
return;
}
}
muxer->dispose();
}

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

@ -1472,7 +1472,7 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio)
if (!mix_correct && is_monotonically_increase) {
if (last_packet_time > 0 && shared_audio->header.timestamp < last_packet_time) {
is_monotonically_increase = false;
srs_warn("stream not monotonically increase, please open mix_correct.");
srs_warn("AUTIO: stream not monotonically increase, please open mix_correct.");
}
}
last_packet_time = shared_audio->header.timestamp;
@ -1663,7 +1663,7 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
if (!mix_correct && is_monotonically_increase) {
if (last_packet_time > 0 && shared_video->header.timestamp < last_packet_time) {
is_monotonically_increase = false;
srs_warn("stream not monotonically increase, please open mix_correct.");
srs_warn("VIDEO: stream not monotonically increase, please open mix_correct.");
}
}
last_packet_time = shared_video->header.timestamp;