重写MP4点播

CMakeLists.txt

@@ -43,10 +43,9 @@ INCLUDE_DIRECTORIES(${MediaKit_Root})
 set(ENABLE_HLS true)
 set(ENABLE_OPENSSL true)
 set(ENABLE_MYSQL false)
-set(ENABLE_MP4V2 true)
 set(ENABLE_FAAC false)
 set(ENABLE_X264 false)
-set(ENABLE_MP4RECORD true)
+set(ENABLE_MP4 true)
 set(ENABLE_RTPPROXY true)
 
 set(LINK_LIB_LIST zlmediakit zltoolkit)
@@ -70,15 +69,6 @@ if (MYSQL_FOUND AND ENABLE_MYSQL)
     list(APPEND LINK_LIB_LIST ${MYSQL_LIBRARIES})
 endif ()
 
-#查找MP4V2是否安装
-find_package(MP4V2 QUIET)
-if (MP4V2_FOUND AND ENABLE_MP4V2)
-    include_directories(${MP4V2_INCLUDE_DIR})
-    list(APPEND LINK_LIB_LIST ${MP4V2_LIBRARY})
-    add_definitions(-DENABLE_MP4V2)
-    message(STATUS "found library:${MP4V2_LIBRARY},ENABLE_MP4V2 defined")
-endif ()
-
 #查找x264是否安装
 find_package(X264 QUIET)
 if (X264_FOUND AND ENABLE_X264)
@@ -127,9 +117,9 @@ if(ENABLE_HLS)
 endif()
 
 #添加mov、flv库用于MP4录制
-if(ENABLE_MP4RECORD)
-    message(STATUS "ENABLE_MP4RECORD defined")
-    add_definitions(-DENABLE_MP4RECORD)
+if(ENABLE_MP4)
+    message(STATUS "ENABLE_MP4 defined")
+    add_definitions(-DENABLE_MP4)
 
     aux_source_directory(${MediaServer_Root}/libmov/include src_mov)
     aux_source_directory(${MediaServer_Root}/libmov/source src_mov)