aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-06 19:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #474 from Colibrow/patch-1

Browse Source 
修复编译问题
This commit is contained in:
夏楚 2020-09-11 09:54:28 +08:00 committed by GitHub
commit f2f41e63bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Common/MultiMediaSourceMuxer.cpp
View File

@ -377,8 +377,11 @@ void MultiMediaSourceMuxer::inputFrame(const Frame::Ptr &frame_in) {
}
bool MultiMediaSourceMuxer::isEnabled(){
return _muxer->isEnabled() || _ps_rtp_sender;
#if defined(ENABLE_RTPPROXY)
return _muxer->isEnabled() || _ps_rtp_sender
#endif //ENABLE_RTPPROXY
return _muxer->isEnabled();
}
}//namespace mediakit
}//namespace mediakit