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

update media-server (#2075)

Browse Source 
* fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated

* update media-server to 357ef88
This commit is contained in:
Aven 2022-11-09 17:44:38 +08:00 committed by GitHub
parent 25a9e51b00
commit af554bc376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/media-server

@ -1 +1 @@
Subproject commit 8f26ef0ec366d8b30a96e76ce5ef4ee0e9569167 Subproject commit 357ef885afa5112c8cb873eab21d94d26744c0ab

2
src/Rtp/Decoder.cpp
View File

@ -18,7 +18,7 @@
#include "Extension/Opus.h" #include "Extension/Opus.h"
#if defined(ENABLE_RTPPROXY) || defined(ENABLE_HLS) #if defined(ENABLE_RTPPROXY) || defined(ENABLE_HLS)
#include "mpeg-ts-proto.h" #include "mpeg-ts.h"
#endif #endif
using namespace toolkit; using namespace toolkit;