From a6dd8fb3a10092fa0361fccefba004b23330a8b4 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 6 Jun 2015 21:31:39 +0800 Subject: [PATCH] fix #421, when mix correct on, must check the type of dequeue msg. --- trunk/src/app/srs_app_source.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 042913b51..f7f7944a3 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1479,7 +1479,11 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio) } // 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); return ret; @@ -1670,7 +1674,11 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) SrsAutoFree(SrsSharedPtrMessage, m); // 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); return ret;