bug fix

CMakeLists.txt

@@ -83,7 +83,7 @@ add_library(zlmediakit STATIC ${MediaKit_src_list})
 
 
 if (WIN32)
 if (WIN32)
     list(APPEND LINK_LIB_LIST WS2_32 Iphlpapi shlwapi)
     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)
     list(APPEND LINK_LIB_LIST pthread)
 endif ()
 endif ()
 
 

src/Device/PlayerProxy.cpp

@@ -58,7 +58,7 @@ void PlayerProxy::play(const char* strUrl) {
 			return;
 			return;
 		}
 		}
 		if(strongSelf->m_pChn){
 		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{
 		}else{
 			strongSelf->initMedia();
 			strongSelf->initMedia();
 		}
 		}
@@ -69,7 +69,7 @@ void PlayerProxy::play(const char* strUrl) {
 			return;
 			return;
 		}
 		}
 		if(strongSelf->m_pChn){
 		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{
 		}else{
 			strongSelf->initMedia();
 			strongSelf->initMedia();
 		}
 		}