From 90c6dd4bfab4a27566893270bb20370892f3b8c5 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Fri, 24 Jan 2020 20:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=ADhls?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt           |  4 ++--
 src/Record/HlsRecorder.h | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a76876e2..ee853b01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ZLMediaKit)
+project(ZLMediaKit)
 cmake_minimum_required(VERSION 3.1.3)
 #使能c++11
 set(CMAKE_CXX_STANDARD 11)
@@ -149,7 +149,7 @@ if(ENABLE_MP4RECORD)
 endif()
 
 #添加rtp库用于rtp转ps/ts
-if(ENABLE_RTPPROXY)
+if(ENABLE_RTPPROXY AND ENABLE_HLS)
     message(STATUS "ENABLE_RTPPROXY defined")
     aux_source_directory(${MediaServer_Root}/librtp/include src_rtp)
     aux_source_directory(${MediaServer_Root}/librtp/source src_rtp)
diff --git a/src/Record/HlsRecorder.h b/src/Record/HlsRecorder.h
index d9e20e33..7b1da82b 100644
--- a/src/Record/HlsRecorder.h
+++ b/src/Record/HlsRecorder.h
@@ -29,10 +29,13 @@
 
 #include "HlsMakerImp.h"
 #include "TsMuxer.h"
-
 namespace mediakit {
 
-class HlsRecorder : public TsMuxer {
+class HlsRecorder
+#if defined(ENABLE_HLS)
+: public TsMuxer
+#endif
+        {
 public:
     typedef std::shared_ptr<HlsRecorder> Ptr;
     HlsRecorder(const string &m3u8_file, const string &params){
@@ -51,14 +54,14 @@ public:
     MediaSource::Ptr getMediaSource() const{
         return _hls->getMediaSource();
     }
+#if defined(ENABLE_HLS)
 protected:
     void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) override {
         _hls->inputData((char *)packet,bytes,timestamp);
     };
+#endif
 private:
     HlsMakerImp *_hls;
 };
-
 }//namespace mediakit
-
 #endif //HLSRECORDER_H