amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 14:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复windows下的编译问题

Browse Source
This commit is contained in:
xiongziliang 2018-03-05 10:41:15 +08:00
parent 3726721dd9
commit 03c04ea6a4
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Common/MediaSource.cpp
View File

@ -29,11 +29,12 @@
#include "MediaFile/MediaReader.h" #include "MediaFile/MediaReader.h"
#include "Util/util.h" #include "Util/util.h"
#include "Rtsp/Rtsp.h" #include "Rtsp/Rtsp.h"
#include "Network/sockutil.h"
using namespace ZL::Util; using namespace ZL::Util;
using namespace ZL::Network;
using namespace ZL::MediaFile; using namespace ZL::MediaFile;
namespace ZL { namespace ZL {
namespace Media { namespace Media {
@ -165,13 +166,11 @@ void MediaInfo::parse(const string &url){
//无效vhost //无效vhost
m_vhost = DEFAULT_VHOST; m_vhost = DEFAULT_VHOST;
}else{ }else{
struct in_addr addr; if(INADDR_NONE != inet_addr(m_vhost.data())){
if(0 != inet_aton(m_vhost.data(),&addr)){
//这是ip,未指定vhost;使用默认vhost //这是ip,未指定vhost;使用默认vhost
m_vhost = DEFAULT_VHOST; m_vhost = DEFAULT_VHOST;
} }
} }
} }

2
src/Common/MediaSource.h
View File

@ -38,8 +38,6 @@
#include "Util/TimeTicker.h" #include "Util/TimeTicker.h"
#include "Util/NoticeCenter.h" #include "Util/NoticeCenter.h"
#include "Rtsp/Rtsp.h" #include "Rtsp/Rtsp.h"
#include <arpa/inet.h>
using namespace std; using namespace std;
using namespace Config; using namespace Config;

5
src/Rtsp/RtpBroadCaster.cpp
View File

@ -26,13 +26,13 @@
#include <list> #include <list>
#include <type_traits> #include <type_traits>
#include <arpa/inet.h>
#include "RtpBroadCaster.h" #include "RtpBroadCaster.h"
#include "Util/util.h" #include "Util/util.h"
#include "Network/sockutil.h" #include "Network/sockutil.h"
#include "RtspSession.h" #include "RtspSession.h"
using namespace std; using namespace std;
using namespace ZL::Network;
namespace ZL { namespace ZL {
namespace Rtsp { namespace Rtsp {
@ -40,8 +40,7 @@ namespace Rtsp {
static uint32_t addressToInt(const string &ip){ static uint32_t addressToInt(const string &ip){
struct in_addr addr; struct in_addr addr;
bzero(&addr,sizeof(addr)); bzero(&addr,sizeof(addr));
addr.s_addr = inet_addr(ip.data());
inet_aton(ip.data(),&addr);
return (uint32_t)ntohl((uint32_t &)addr.s_addr); return (uint32_t)ntohl((uint32_t &)addr.s_addr);
} }