mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-07-30 05:48:21 +08:00
MPEG: 整合复用ts/ps生成代码
This commit is contained in:
@@ -187,10 +187,7 @@ endif ()
|
||||
set(VS_FALGS "/wd4819")
|
||||
|
||||
#添加mpeg用于支持ts生成
|
||||
if (ENABLE_HLS)
|
||||
message(STATUS "ENABLE_HLS defined")
|
||||
add_definitions(-DENABLE_HLS)
|
||||
|
||||
if (ENABLE_RTPPROXY OR ENABLE_HLS)
|
||||
include_directories(${MediaServer_Root}/libmpeg/include)
|
||||
aux_source_directory(${MediaServer_Root}/libmpeg/include src_mpeg)
|
||||
aux_source_directory(${MediaServer_Root}/libmpeg/source src_mpeg)
|
||||
@@ -228,12 +225,16 @@ if (ENABLE_MP4)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
#添加rtp库用于rtp转ps/ts
|
||||
if (ENABLE_RTPPROXY AND ENABLE_HLS)
|
||||
if (ENABLE_RTPPROXY)
|
||||
message(STATUS "ENABLE_RTPPROXY defined")
|
||||
add_definitions(-DENABLE_RTPPROXY)
|
||||
endif ()
|
||||
|
||||
if (ENABLE_HLS)
|
||||
message(STATUS "ENABLE_HLS defined")
|
||||
add_definitions(-DENABLE_HLS)
|
||||
endif ()
|
||||
|
||||
#收集源代码
|
||||
file(GLOB ToolKit_src_list ${ToolKit_Root}/*/*.cpp ${ToolKit_Root}/*/*.h ${ToolKit_Root}/*/*.c)
|
||||
if (IOS)
|
||||
|
||||
Reference in New Issue
Block a user