1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

merge from 2.0release

This commit is contained in:
winlin 2015-08-11 15:49:48 +08:00
commit f28c9b7eb5
5 changed files with 72 additions and 11 deletions

View file

@ -1490,7 +1490,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("AUTIO: stream not monotonically increase, please open mix_correct.");
srs_warn("AUDIO: stream not monotonically increase, please open mix_correct.");
}
}
last_packet_time = shared_audio->header.timestamp;