Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
xiongguangjie 2022-06-13 10:59:25 +08:00
commit 4f444203eb

View File

@ -290,6 +290,7 @@ if (ENABLE_FFMPEG)
if (AVUTIL_FOUND AND AVCODEC_FOUND AND SWSCALE_FOUND AND SWRESAMPLE_FOUND) if (AVUTIL_FOUND AND AVCODEC_FOUND AND SWSCALE_FOUND AND SWRESAMPLE_FOUND)
add_definitions(-DENABLE_FFMPEG) add_definitions(-DENABLE_FFMPEG)
list(APPEND LINK_LIB_LIST ${CMAKE_DL_LIBS})
else () else ()
set(ENABLE_FFMPEG off) set(ENABLE_FFMPEG off)
message(WARNING "ffmpeg相关功能未找到") message(WARNING "ffmpeg相关功能未找到")