diff --git a/README.md b/README.md index 501518da..bfe534f7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![logo](https://raw.githubusercontent.com/zlmediakit/ZLMediaKit/master/logo.png) + # A lightweight ,high performance and stable stream server and client framework based on C++11. [![Build Status](https://travis-ci.org/xiongziliang/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xiongziliang/ZLMediaKit) diff --git a/README_CN.md b/README_CN.md index 01bc735f..bc277367 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,3 +1,4 @@ +![logo](https://raw.githubusercontent.com/zlmediakit/ZLMediaKit/master/logo.png) # 一个基于C++11的高性能运营级流媒体服务框架 [![Build Status](https://travis-ci.org/xiongziliang/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xiongziliang/ZLMediaKit) @@ -60,7 +61,7 @@ - 支持流量统计、推流播放鉴权等事件 - 支持rtsp/rtmp/http虚拟主机 - 支持flv、mp4文件录制 - - 支持rtps/rtmp点播,支持seek + - 支持rtps/rtmp协议的mp4点播,支持seek - 支持按需拉流,无人观看自动关断拉流 - 支持先拉流后推流,提高及时推流画面打开率 - 支持rtsp/rtmp/http-flv/hls播放鉴权(url参数方式) diff --git a/logo.png b/logo.png new file mode 100644 index 00000000..dd1379cb Binary files /dev/null and b/logo.png differ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fcf88764..ee75592c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,9 +44,9 @@ foreach(TEST_SRC ${TEST_SRC_LIST}) target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) endforeach() -if(MSVC) +if(MSVC AND SDL2_FOUND AND AVCODEC_FOUND AND AVUTIL_FOUND) set_target_properties(test_player PROPERTIES LINK_FLAGS "/SAFESEH:NO /SUBSYSTEM:WINDOWS" ) -endif(MSVC) +endif()