From af554bc37616d1632161cd3815b992fe638755ff Mon Sep 17 00:00:00 2001 From: Aven Date: Wed, 9 Nov 2022 17:44:38 +0800 Subject: [PATCH] update media-server (#2075) * fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated * update media-server to 357ef88 --- 3rdpart/media-server | 2 +- src/Rtp/Decoder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdpart/media-server b/3rdpart/media-server index 8f26ef0e..357ef885 160000 --- a/3rdpart/media-server +++ b/3rdpart/media-server @@ -1 +1 @@ -Subproject commit 8f26ef0ec366d8b30a96e76ce5ef4ee0e9569167 +Subproject commit 357ef885afa5112c8cb873eab21d94d26744c0ab diff --git a/src/Rtp/Decoder.cpp b/src/Rtp/Decoder.cpp index 22438fd1..37a347ac 100644 --- a/src/Rtp/Decoder.cpp +++ b/src/Rtp/Decoder.cpp @@ -18,7 +18,7 @@ #include "Extension/Opus.h" #if defined(ENABLE_RTPPROXY) || defined(ENABLE_HLS) -#include "mpeg-ts-proto.h" +#include "mpeg-ts.h" #endif using namespace toolkit;