weiai/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-03-16 19:10:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FreeNVR/freenvr'

Browse Source 
# Conflicts:
#	server/FFmpegSource.cpp
#	server/Process.cpp
#	server/Process.h
#	server/System.cpp
This commit is contained in:
xiongziliang
2020-01-07 15:08:15 +08:00
parent 9c42c5ed8c 5b533354c3
commit 77bbc7ae4d
6 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/Process.h
View File

@@ -1,4 +1,4 @@
/*
/*
* MIT License
*
* Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>