Merge pull request #1994 from Dw9/master

修复rtsp 推pcm L16, 空指针的异常

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)
 

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) {