mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-12 19:24:22 +08:00
修正libavfilter相关的编译问题和transcode内的错误 (#4587)
1. 最近提交的libavfilter相关的代码,没有充分测试cmake编译问题,提交了修正。 2. transcode内存在一个c++11的兼容性问题和运算符优先级问题,提交了修正。
This commit is contained in:
16
cmake/FindAVFILTER.cmake
Normal file
16
cmake/FindAVFILTER.cmake
Normal file
@@ -0,0 +1,16 @@
|
||||
find_path(AVFILTER_INCLUDE_DIR
|
||||
NAMES libavfilter/avfilter.h
|
||||
HINTS ${FFMPEG_PATH_ROOT}
|
||||
PATH_SUFFIXES include)
|
||||
|
||||
find_library(AVFILTER_LIBRARY
|
||||
NAMES avfilter
|
||||
HINTS ${FFMPEG_PATH_ROOT}
|
||||
PATH_SUFFIXES bin lib)
|
||||
|
||||
set(AVFILTER_LIBRARIES ${AVFILTER_LIBRARY})
|
||||
set(AVFILTER_INCLUDE_DIRS ${AVFILTER_INCLUDE_DIR})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_package_handle_standard_args(AVFILTER DEFAULT_MSG AVFILTER_LIBRARY AVFILTER_INCLUDE_DIR)
|
||||
16
cmake/FindTCMALLOC.cmake
Normal file
16
cmake/FindTCMALLOC.cmake
Normal file
@@ -0,0 +1,16 @@
|
||||
find_path(Tcmalloc_INCLUDE_DIR
|
||||
NAMES google/tcmalloc.h
|
||||
)
|
||||
|
||||
find_library(Tcmalloc_LIBRARY
|
||||
NAMES tcmalloc_minimal tcmalloc
|
||||
)
|
||||
|
||||
set(TCMALLOC_LIBRARIES ${Tcmalloc_LIBRARY})
|
||||
set(TCMALLOC_INCLUDE_DIRS ${Tcmalloc_INCLUDE_DIR})
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCMALLOC
|
||||
DEFAULT_MSG
|
||||
TCMALLOC_LIBRARIES TCMALLOC_INCLUDE_DIRS
|
||||
)
|
||||
Reference in New Issue
Block a user