amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复在win32上编译问题

Browse Source
This commit is contained in:
xiongziliang 2018-07-06 23:04:43 +08:00
parent 23e73f7c62
commit 678bdcdbfd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZLToolKit

@ -1 +1 @@
Subproject commit 8225192d05f058b02bcbd3847f392e0be0b59079 Subproject commit 7edec2d0d689406b2b34413597061fdc387be0ee

2
src/Rtsp/RtpBroadCaster.cpp
View File

@ -148,7 +148,7 @@ RtpBroadCaster::RtpBroadCaster(const string &strLocalIp,const string &strVhost,c
<< strVhost << " " << strVhost << " "
<< strApp << " " << strStream; << strApp << " " << strStream;
} }
uint16_t RtpBroadCaster::getPort(int trackType){ uint16_t RtpBroadCaster::getPort(TrackType trackType){
return m_apUdpSock[trackType]->get_local_port(); return m_apUdpSock[trackType]->get_local_port();
} }
string RtpBroadCaster::getIP(){ string RtpBroadCaster::getIP(){

3
src/Rtsp/RtpBroadCaster.h
View File

@ -33,6 +33,7 @@
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
#include "Common/config.h" #include "Common/config.h"
#include "Rtsp.h"
#include "RtspMediaSource.h" #include "RtspMediaSource.h"
#include "Util/mini.h" #include "Util/mini.h"
#include "Network/Socket.h" #include "Network/Socket.h"
@ -74,7 +75,7 @@ public:
virtual ~RtpBroadCaster(); virtual ~RtpBroadCaster();
static Ptr get(const string &strLocalIp,const string &strVhost,const string &strApp,const string &strStream); static Ptr get(const string &strLocalIp,const string &strVhost,const string &strApp,const string &strStream);
void setDetachCB(void *listener,const onDetach &cb); void setDetachCB(void *listener,const onDetach &cb);
uint16_t getPort(int trackType); uint16_t getPort(TrackType trackType);
string getIP(); string getIP();
private: private:
static recursive_mutex g_mtx; static recursive_mutex g_mtx;