From 412424b2bb417637e277b76a7c43b3b5b14b3694 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Tue, 27 Mar 2018 00:40:22 +0800
Subject: [PATCH] bug fix

---
 CMakeLists.txt             | 2 +-
 src/Device/PlayerProxy.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d7822d3..9db7acc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ add_library(zlmediakit STATIC ${MediaKit_src_list})
 
 if (WIN32)
     list(APPEND LINK_LIB_LIST WS2_32 Iphlpapi shlwapi)
-elseif(NOT ANDROID and NOT IOS)
+elseif(NOT ANDROID OR IOS)
     list(APPEND LINK_LIB_LIST pthread)
 endif ()
 
diff --git a/src/Device/PlayerProxy.cpp b/src/Device/PlayerProxy.cpp
index 074fe814..ea8cd61c 100644
--- a/src/Device/PlayerProxy.cpp
+++ b/src/Device/PlayerProxy.cpp
@@ -58,7 +58,7 @@ void PlayerProxy::play(const char* strUrl) {
 			return;
 		}
 		if(strongSelf->m_pChn){
-			strongSelf->m_pChn->inputH264((char *)data.data.data(), data.data.size(), data.timeStamp);
+			strongSelf->m_pChn->inputH264((char *)data.data.data(), data.data.size(), 0);
 		}else{
 			strongSelf->initMedia();
 		}
@@ -69,7 +69,7 @@ void PlayerProxy::play(const char* strUrl) {
 			return;
 		}
 		if(strongSelf->m_pChn){
-			strongSelf->m_pChn->inputAAC((char *)data.data, data.aac_frame_length, data.timeStamp);
+			strongSelf->m_pChn->inputAAC((char *)data.data, data.aac_frame_length, 0);
 		}else{
 			strongSelf->initMedia();
 		}