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

for linux compile --start-group and --end-group

Browse Source
This commit is contained in:
xiongguangjie 2021-06-25 22:03:52 +08:00
parent 6d8d64caf6
commit c0f362af33
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/CMakeLists.txt
View File

@ -62,7 +62,13 @@ foreach(TEST_SRC ${TEST_SRC_LIST})
if(WIN32) if(WIN32)
set_target_properties(${TEST_EXE_NAME} PROPERTIES COMPILE_FLAGS ${VS_FALGS} ) set_target_properties(${TEST_EXE_NAME} PROPERTIES COMPILE_FLAGS ${VS_FALGS} )
endif(WIN32) endif(WIN32)
target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) if (CMAKE_SYSTEM_NAME MATCHES "Linux")
target_link_libraries(${TEST_EXE_NAME} -Wl,--start-group ${LINK_LIB_LIST} -Wl,--end-group)
else ()
target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST})
endif ()
#target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST})
endforeach() endforeach()
if(MSVC AND SDL2_FOUND AND AVCODEC_FOUND AND AVUTIL_FOUND) if(MSVC AND SDL2_FOUND AND AVCODEC_FOUND AND AVUTIL_FOUND)

7
webrtc/WebRtcTransport.cpp
View File

@ -745,12 +745,7 @@ void WebRtcTransportImp::onRtp(const char *buf, size_t len) {
} }
#endif #endif
//解析并排序rtp //解析并排序rtp
if(!ref){ ref->inputRtp(track->media->type, track->plan_rtp->sample_rate, (uint8_t *) buf, len, false);
InfoL << "ignore no rtp receiver of ssrc:" << ssrc<<" is rtx:"<<rtx;
return;
}
assert(ref);
ref->inputRtp(info->media->type, info->plan_rtp->sample_rate, (uint8_t *) buf, len);
return; return;
} }