diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp index 47439b4f..ee391b61 100644 --- a/src/Rtmp/RtmpProtocol.cpp +++ b/src/Rtmp/RtmpProtocol.cpp @@ -8,11 +8,13 @@ * may be found in the AUTHORS file in the root of the source tree. */ +#include #include "RtmpProtocol.h" #include "Rtmp/utils.h" #include "RtmpMediaSource.h" -using namespace toolkit; + using namespace std; +using namespace toolkit; #define C1_DIGEST_SIZE 32 #define C1_KEY_SIZE 128 @@ -752,7 +754,7 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) { case MSG_WIN_SIZE: { //如果窗口太小,会导致发送sendAcknowledgement时无限递归:https://github.com/ZLMediaKit/ZLMediaKit/issues/1839 - _windows_size = std::max(load_be32(&chunk_data.buffer[0]), 32 * 1024U); + _windows_size = max(load_be32(&chunk_data.buffer[0]), 32 * 1024U); TraceL << "MSG_WIN_SIZE:" << _windows_size; break; }