THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from zlmediakit/master 

update
This commit is contained in:
baiyfcu 2019-07-30 09:52:08 +08:00 committed by GitHub
parent 3efea46c5e 1e3591becc
commit 16db003434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. # 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) [![Build Status](https://travis-ci.org/xiongziliang/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xiongziliang/ZLMediaKit)

3
README_CN.md
View File

@ -1,3 +1,4 @@
![logo](https://raw.githubusercontent.com/zlmediakit/ZLMediaKit/master/logo.png)
# 一个基于C++11的高性能运营级流媒体服务框架 # 一个基于C++11的高性能运营级流媒体服务框架
[![Build Status](https://travis-ci.org/xiongziliang/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xiongziliang/ZLMediaKit) [![Build Status](https://travis-ci.org/xiongziliang/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xiongziliang/ZLMediaKit)
@ -60,7 +61,7 @@
- 支持流量统计、推流播放鉴权等事件 - 支持流量统计、推流播放鉴权等事件
- 支持rtsp/rtmp/http虚拟主机 - 支持rtsp/rtmp/http虚拟主机
- 支持flv、mp4文件录制 - 支持flv、mp4文件录制
- 支持rtps/rtmp点播，支持seek - 支持rtps/rtmp协议的mp4点播，支持seek
- 支持按需拉流，无人观看自动关断拉流 - 支持按需拉流，无人观看自动关断拉流
- 支持先拉流后推流，提高及时推流画面打开率 - 支持先拉流后推流，提高及时推流画面打开率
- 支持rtsp/rtmp/http-flv/hls播放鉴权(url参数方式) - 支持rtsp/rtmp/http-flv/hls播放鉴权(url参数方式)

BIN
logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

4
tests/CMakeLists.txt
View File

@ -44,9 +44,9 @@ foreach(TEST_SRC ${TEST_SRC_LIST})
target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST})
endforeach() 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" ) set_target_properties(test_player PROPERTIES LINK_FLAGS "/SAFESEH:NO /SUBSYSTEM:WINDOWS" )
endif(MSVC) endif()