external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

fix #421, when mix correct on, must check the type of dequeue msg.

Browse source
This commit is contained in:
winlin 2015-06-06 21:31:39 +08:00
parent a1dd734318
commit a6dd8fb3a1
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1479,7 +1479,11 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio)
} }
// consume the monotonically increase message. // consume the monotonically increase message.
ret = on_audio_imp(m); if (m->is_audio()) {
ret = on_audio_imp(m);
} else {
ret = on_video_imp(m);
}
srs_freep(m); srs_freep(m);
return ret; return ret;
@ -1670,7 +1674,11 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
SrsAutoFree(SrsSharedPtrMessage, m); SrsAutoFree(SrsSharedPtrMessage, m);
// consume the monotonically increase message. // consume the monotonically increase message.
ret = on_video_imp(m); if (m->is_audio()) {
ret = on_audio_imp(m);
} else {
ret = on_video_imp(m);
}
srs_freep(m); srs_freep(m);
return ret; return ret;