From 51fcaeda4c8e0fc63c7f369a2d3f8289d1a3fe71 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 18 Oct 2020 21:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/media-server   | 2 +-
 src/Record/TsMuxer.cpp | 1 +
 src/Rtp/PSDecoder.cpp  | 1 +
 src/Rtp/PSEncoder.cpp  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/3rdpart/media-server b/3rdpart/media-server
index d54285e9..b878e869 160000
--- a/3rdpart/media-server
+++ b/3rdpart/media-server
@@ -1 +1 @@
-Subproject commit d54285e96260e6d56d68929ec9ace402b83ff6b0
+Subproject commit b878e869f995855d09013585de686e6a7330bd43
diff --git a/src/Record/TsMuxer.cpp b/src/Record/TsMuxer.cpp
index fa31388f..f6e64fc2 100644
--- a/src/Record/TsMuxer.cpp
+++ b/src/Record/TsMuxer.cpp
@@ -172,6 +172,7 @@ void TsMuxer::init() {
                 TsMuxer *muxer = (TsMuxer *) param;
                 muxer->onTs(packet, bytes, muxer->_timestamp, muxer->_is_idr_fast_packet);
                 muxer->_is_idr_fast_packet = false;
+                return 0;
             }
     };
     if (_context == nullptr) {
diff --git a/src/Rtp/PSDecoder.cpp b/src/Rtp/PSDecoder.cpp
index 911ef046..9e76dfc9 100644
--- a/src/Rtp/PSDecoder.cpp
+++ b/src/Rtp/PSDecoder.cpp
@@ -26,6 +26,7 @@ PSDecoder::PSDecoder() {
         if(thiz->_on_decode){
             thiz->_on_decode(stream, codecid, flags, pts, dts, data, bytes);
         }
+        return 0;
     },this);
 }
 
diff --git a/src/Rtp/PSEncoder.cpp b/src/Rtp/PSEncoder.cpp
index dcba1755..b6688af0 100644
--- a/src/Rtp/PSEncoder.cpp
+++ b/src/Rtp/PSEncoder.cpp
@@ -38,6 +38,7 @@ void PSEncoder::init() {
             [](void *param, int stream, void *packet, size_t bytes) {
                 PSEncoder *thiz = (PSEncoder *) param;
                 thiz->onPS(thiz->_timestamp, packet, bytes);
+                return 0;
             }
     };