From 9b8f2c5f3da65267195d26c093f5f39ae0e94e82 Mon Sep 17 00:00:00 2001 From: Dw9 Date: Sun, 25 Sep 2022 12:12:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dassert=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd326292..29ad24ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,7 +418,7 @@ endif() include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for assert.h -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpart) add_subdirectory(3rdpart) From 6f1a45db8a587504cfebaf66c801318ac53aa4aa Mon Sep 17 00:00:00 2001 From: Dw9 Date: Sun, 25 Sep 2022 12:13:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A8rtsp=20L16?= =?UTF-8?q?=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MultiMediaSourceMuxer.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp index a6118f61..235c6ea4 100644 --- a/src/Common/MultiMediaSourceMuxer.cpp +++ b/src/Common/MultiMediaSourceMuxer.cpp @@ -312,10 +312,6 @@ EventPoller::Ptr MultiMediaSourceMuxer::getOwnerPoller(MediaSource &sender) { } bool MultiMediaSourceMuxer::onTrackReady(const Track::Ptr &track) { - if (CodecL16 == track->getCodecId()) { - WarnL << "L16音频格式目前只支持RTSP协议推流拉流!!!"; - return false; - } bool ret = false; if (_rtmp) {